diff --git a/Dockerfile b/Dockerfile
index 24364c27..9df5271e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-FROM python
-RUN pip3 install requests discord.py docker pybooru && \
+FROM python:3.6.2-slim
+RUN apt-get update && apt-get install -y curl &&\
+    pip3 install requests discord.py docker pybooru && \
     curl -Lks get.docker.com | bash
 
 ADD dragon-bot.py /
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index c5462736..3fa6710f 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -10,15 +10,21 @@ options:
   docker: true
 
 pipelines:
-  default:
-    - step:
-        script: # Modify the commands below to build your repository.
-          # Set $DOCKER_HUB_USERNAME and $DOCKER_HUB_PASSWORD as environment variables in repository settings
-          - export IMAGE_NAME=ldooks/dragon-bot:latest
-
-          # build the Docker image (this will use the Dockerfile in the root of the repo)
-          - docker build -t $IMAGE_NAME .
-          # authenticate with the Docker Hub registry
-          - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
-          # push the new Docker image to the Docker registry
-          - docker push $IMAGE_NAME
\ No newline at end of file
+  branches:
+    master:
+      - step:
+          script:
+            - export IMAGE_NAME=ldooks/dragon-bot:latest
+            # build the Docker image (this will use the Dockerfile in the root of the repo)
+            - docker build -t $IMAGE_NAME .
+            # authenticate with the Docker Hub registry
+            - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+            # push the new Docker image to the Docker registry
+            - docker push $IMAGE_NAME
+    feature/*:
+      - step:
+          script:
+            # Only build iamges, dont push when we're on a feature branch
+            - export IMAGE_NAME=ldooks/dragon-bot:latest
+            # build the Docker image (this will use the Dockerfile in the root of the repo)
+            - docker build -t $IMAGE_NAME .
\ No newline at end of file
diff --git a/build_and_deploy.sh b/build_and_deploy.sh
index 70ddf066..e0092b51 100755
--- a/build_and_deploy.sh
+++ b/build_and_deploy.sh
@@ -1,7 +1,7 @@
 # Put the latest version of the dragon-bot.py in the container
-printf "[-] Rebuilding container with latest code\n"
-docker build -t dragon-bot .
-printf "[+] Done\n"
+# printf "[-] Rebuilding container with latest code\n"
+# docker build -t dragon-bot .
+# printf "[+] Done\n"
 
 # Remove the running container so we cna re-use the container name 'dragon-bot'
 printf "\n[-] Deleting old dragon-bot container from system\n"
@@ -10,5 +10,5 @@ printf "[+] Done\n"
 
 # Run that shit and mount the docker socket so it can talk to the sky-factory container
 printf "\n[-] Starting up latest build of container\n"
-docker run -d --name dragon-bot -v /var/run/docker.sock:/var/run/docker.sock --restart always dragon-bot
+docker run -d --name dragon-bot -v /var/run/docker.sock:/var/run/docker.sock --restart always ldooks/dragon-bot
 printf "[+] Done\n"