diff --git a/Dockerfile b/Dockerfile
index 086fd93e..4aeca8e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,9 @@ WORKDIR /algo
 COPY requirements.txt .
 RUN apk --no-cache add ${BUILD_PACKAGES} && \
     python -m pip --no-cache-dir install -U pip && \
+    python -m pip --no-cache-dir install virtualenv && \
+    python -m virtualenv env && \
+    source env/bin/activate && \
     python -m pip --no-cache-dir install -r requirements.txt && \
     apk del ${BUILD_PACKAGES}
 COPY . .
diff --git a/Makefile b/Makefile
index 3756ed4a..94e254ae 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ docker-deploy:
 	--cap-drop=all \
 	--rm \
 	-it \
-	-e "DOCKER_BUILD=true" \
 	-v $(CONFIGURATIONS):/data \
 	$(IMAGE):$(TAG)
 
diff --git a/algo b/algo
index 65ed8844..0c8a5223 100755
--- a/algo
+++ b/algo
@@ -2,7 +2,7 @@
 
 set -e
 
-if [[ -z ${VIRTUAL_ENV+x} && -z ${DOCKER_BUILD+x} ]]
+if [[ -z ${VIRTUAL_ENV+x} ]]
 then
   ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate"
   if [ -f "$ACTIVATE_SCRIPT" ]