diff --git a/Dockerfile b/Dockerfile
index 1c050dc3..2fb0781e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ RUN apt-get -qq update \
     && apt-get -y upgrade \
     && apt-get install -y jq \
     && pip install --no-cache-dir --process-dependency-links . \
-    && pip install --no-cache-dir . \
     && apt-get autoremove \
     && apt-get clean
 
diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one
index 94135ca5..d275477c 100644
--- a/Dockerfile-all-in-one
+++ b/Dockerfile-all-in-one
@@ -1,4 +1,4 @@
- FROM alpine:latest
+FROM alpine:latest
 LABEL maintainer "dev@bigchaindb.com"
 
 ARG TM_VERSION=0.22.8
@@ -13,7 +13,7 @@ RUN apk --update add sudo bash \
         libffi-dev openssl-dev build-base jq \
     && apk add --no-cache libstdc++ dpkg gnupg \
     && pip3 install --upgrade pip cffi \
-    && pip install --no-cache-dir --process-dependency-links -e .[dev] \
+    && pip install --no-cache-dir --process-dependency-links . \
     && apk del build-dependencies \
     && rm -f /var/cache/apk/*
 
@@ -35,10 +35,6 @@ RUN addgroup tmuser \
 RUN mkdir -p /data/db /data/configdb \
         && chown -R mongodb:mongodb /data/db /data/configdb
 
-# When developing with Python in a docker container, we are using PYTHONBUFFERED
-# to force stdin, stdout and stderr to be totally unbuffered and to capture logs/outputs
-ENV PYTHONUNBUFFERED 0
-
 # BigchainDB enviroment variables
 ENV BIGCHAINDB_DATABASE_PORT 27017
 ENV BIGCHAINDB_DATABASE_BACKEND localmongodb
diff --git a/docs/server/source/appendices/all-in-one-bigchaindb.md b/docs/server/source/appendices/all-in-one-bigchaindb.md
index 1ada5415..149fd3f1 100644
--- a/docs/server/source/appendices/all-in-one-bigchaindb.md
+++ b/docs/server/source/appendices/all-in-one-bigchaindb.md
@@ -13,8 +13,11 @@ This image contains all the services required for a BigchainDB node i.e.
 - MongoDB
 - Tendermint
 
-*We understand that it is an anti-pattern to run multiple services inside a docker.*
-*This image is to help quick deployment for early adopters*
+**Note:** *This image is to help quick deployment for early adopters, for a more standard*
+*approach please refer to one of our deployment guides:*
+
+- [BigchainDB developer setup guides](https://docs.bigchaindb.com/projects/contributing/en/latest/dev-setup-coding-and-contribution-process/index.html).
+- [BigchainDB with Kubernetes](http://docs.bigchaindb.com/projects/server/en/latest/production-deployment-template/index.html).
 
 ## Prerequisite(s)
 - [Docker](https://docs.docker.com/engine/installation/)