diff --git a/Dockerfile b/Dockerfile
index 5112ec1a..2e310fe3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,15 @@
-FROM python:3.6-alpine3.9
+FROM python:3.6-buster AS builder
+RUN apt-get update && apt-get install -y gcc python-pip
 ADD app/requirements.txt /requirements.txt
+RUN pip install -U pip && pip install -r requirements.txt
+
+#stage 2
+FROM python:3.6-alpine3.9
+
 RUN apk update && \
-	apk add --no-cache docker && \
-	pip install -U pip && \
-	pip install -r requirements.txt
+	apk add --no-cache docker
+
+COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
+
 ADD app /app
 CMD python /app/dragon-bot.py
diff --git a/Dockerfile-test-env b/Dockerfile-test-env
index a036b858..a91673dd 100644
--- a/Dockerfile-test-env
+++ b/Dockerfile-test-env
@@ -1,10 +1,15 @@
-FROM python:3.6.2-alpine3.6
+FROM python:3.6-buster AS builder
+RUN apt-get update && apt-get install -y gcc python-pip
 ADD app/requirements.txt /requirements.txt
+RUN pip install -U pip && pip install -r requirements.txt
+
+#stage 2
+FROM python:3.6-alpine3.9
+
 RUN apk update && \
-	apk add --no-cache vim docker build-base && \
-	pip install -U pip && \
-	pip install pylint && \
-	pip install -r requirements.txt
+	apk add --no-cache docker
+
+COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
 
 ADD app /app
 RUN printf "\n\nTesting your python code for errors\n\n" && \
@@ -12,3 +17,5 @@ RUN printf "\n\nTesting your python code for errors\n\n" && \
 
 WORKDIR /app
 RUN printf "\n#########################\n  Run dragon bot by typing \n  python dragon-bot.py\n#########################\n\n"
+
+CMD python /app/dragon-bot.py
diff --git a/Dockerfile-test-env.bak b/Dockerfile-test-env.bak
new file mode 100644
index 00000000..a036b858
--- /dev/null
+++ b/Dockerfile-test-env.bak
@@ -0,0 +1,14 @@
+FROM python:3.6.2-alpine3.6
+ADD app/requirements.txt /requirements.txt
+RUN apk update && \
+	apk add --no-cache vim docker build-base && \
+	pip install -U pip && \
+	pip install pylint && \
+	pip install -r requirements.txt
+
+ADD app /app
+RUN printf "\n\nTesting your python code for errors\n\n" && \
+  pylint -E /app/*.py
+
+WORKDIR /app
+RUN printf "\n#########################\n  Run dragon bot by typing \n  python dragon-bot.py\n#########################\n\n"
diff --git a/app/requirements.txt b/app/requirements.txt
index 304bdc28..635eabb5 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -6,4 +6,4 @@ gTTS-token
 pyowm
 requests
 wikipedia
-wolframalpha
+wolframalpha
\ No newline at end of file