diff --git a/Dockerfile b/Dockerfile
index 7ea90e59..c2a74c37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,24 @@
-FROM python:3.6.2
+FROM python:3.6.3
 
 # -- Install Pipenv:
-RUN pip install pipenv --upgrade
+RUN set -ex && pip install pipenv --upgrade
 
 # -- Install Application into container:
-RUN mkdir /app
+RUN set -ex && mkdir /app
+
 WORKDIR /app
 
+# -- Adding Pipfiles
+ONBUILD COPY Pipfile Pipfile
+ONBUILD COPY Pipfile.lock Pipfile.lock
+
+# -- Install dependencies:
+ONBUILD RUN set -ex && pipenv install --deploy --system
+
 # --------------------
 # - Using This File: -
 # --------------------
 
 # FROM kennethreitz/pipenv
 
-# COPY Pipfile Pipfile
-# COPY Pipfile.lock Pipfile.lock
 # COPY . /app
-
-# -- Install dependencies:
-# RUN pipenv install --deploy --system
-
-ENTRYPOINT []
-CMD [ "/bin/bash" ]
\ No newline at end of file