diff --git a/Dockerfile b/Dockerfile
index 778ff7af..44a26e4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
-FROM python:3.6.2-slim
+FROM python:3.6.2-alpine3.6
 LABEL name="Dragon Bot"
-RUN apt-get update && apt-get install curl -y &&\
-    curl -Lks get.docker.com | bash
+RUN apk update && apk add --no-cache curl vim docker
 
 RUN pip install requests discord.py docker pybooru
 ADD app /app
diff --git a/Dockerfile-test-env b/Dockerfile-test-env
index 125406c1..30b98543 100644
--- a/Dockerfile-test-env
+++ b/Dockerfile-test-env
@@ -1,7 +1,6 @@
-FROM python:3.6.2-slim
+FROM python:3.6.2-alpine3.6
 LABEL name="Dragon Bot Test environment"
-RUN apt-get update && apt-get install curl vim -y &&\
-    curl -Lks get.docker.com | bash
+RUN apk update && apk add --no-cache curl vim docker
 
 RUN pip install requests discord.py docker pybooru pylint
 ADD app /app
diff --git a/test-dragon-bot.sh b/test-dragon-bot.sh
index b092334d..2b0471da 100755
--- a/test-dragon-bot.sh
+++ b/test-dragon-bot.sh
@@ -6,5 +6,5 @@ printf "[+] Done\n"
 # Run that shit and mount the docker socket so it can talk to the sky-factory container
 printf "\n[-] Running dragon bot in test mode\n"
 docker build -f ./Dockerfile-test-env -t dragon-bot-test . || exit
-docker run -ti --name dragon-bot-test -e DRAGON_ENV=test -v /var/run/docker.sock:/var/run/docker.sock dragon-bot-test bash
+docker run -ti --name dragon-bot-test -e DRAGON_ENV=test -v /var/run/docker.sock:/var/run/docker.sock dragon-bot-test sh
 printf "[+] Done\n"