diff --git a/python/docker/Dockerfile.adapter_ponsim_olt b/python/docker/Dockerfile.adapter_ponsim_olt
index d5d1bf0..de1851f 100644
--- a/python/docker/Dockerfile.adapter_ponsim_olt
+++ b/python/docker/Dockerfile.adapter_ponsim_olt
@@ -15,7 +15,20 @@
 
 # Update to have latest images
 RUN apt-get update && \
-    apt-get install -y python openssl iproute2 libpcap-dev wget build-essential git binutils python-dev libffi-dev libssl-dev
+    apt-get install -y --no-install-recommends \
+	ca-certificates=20170717~16.04.2 \
+        python=2.7.12-1~16.04 \
+        openssl=1.0.2g-1ubuntu4.15 \
+        iproute2=4.3.0-1ubuntu3.16.04.5 \
+        libpcap-dev=1.7.4-2 \
+        wget=1.17.1-1ubuntu1.5 \
+        build-essential=12.1ubuntu2 \
+        git=1:2.7.4-0ubuntu1.6 \
+        binutils=2.26.1-1ubuntu1~16.04.8 \
+        python-dev=2.7.12-1~16.04 \
+        libffi-dev=3.2.1-4 \
+        libssl-dev=1.0.2g-1ubuntu4.15 \
+        && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install current version of pip rather than outdated pip from apt
 RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
@@ -29,11 +42,11 @@
 ARG LOCAL_PROTOS
 COPY local_imports/ /local_imports/
 RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
-    pip install /local_imports/pyvoltha/dist/*.tar.gz ; \
+    pip install /local_imports/pyvoltha/dist/*.tar.gz==* ; \
 fi
 
 RUN if [ -n "$LOCAL_PROTOS" ] ; then \
-    pip install /local_imports/voltha-protos/dist/*.tar.gz ; \
+    pip install /local_imports/voltha-protos/dist/*.tar.gz==* ; \
 fi
 
 # Bundle app source
diff --git a/python/docker/Dockerfile.adapter_ponsim_onu b/python/docker/Dockerfile.adapter_ponsim_onu
index 10c8ef2..21cd0e6 100644
--- a/python/docker/Dockerfile.adapter_ponsim_onu
+++ b/python/docker/Dockerfile.adapter_ponsim_onu
@@ -15,7 +15,20 @@
 
 # Update to have latest images
 RUN apt-get update && \
-    apt-get install -y python openssl iproute2 libpcap-dev wget build-essential git binutils python-dev libffi-dev libssl-dev
+    apt-get install -y --no-install-recommends \
+	ca-certificates=20170717~16.04.2 \
+        python=2.7.12-1~16.04 \
+        openssl=1.0.2g-1ubuntu4.15 \
+        iproute2=4.3.0-1ubuntu3.16.04.5 \
+        libpcap-dev=1.7.4-2 \
+        wget=1.17.1-1ubuntu1.5 \
+        build-essential=12.1ubuntu2 \
+        git=1:2.7.4-0ubuntu1.6 \
+        binutils=2.26.1-1ubuntu1~16.04.8 \
+        python-dev=2.7.12-1~16.04 \
+        libffi-dev=3.2.1-4 \
+        libssl-dev=1.0.2g-1ubuntu4.15 \
+        && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install current version of pip rather than outdated pip from apt
 RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
@@ -29,11 +42,11 @@
 ARG LOCAL_PROTOS
 COPY local_imports/ /local_imports/
 RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
-    pip install /local_imports/pyvoltha/dist/*.tar.gz ; \
+    pip install /local_imports/pyvoltha/dist/*.tar.gz==* ; \
 fi
 
 RUN if [ -n "$LOCAL_PROTOS" ] ; then \
-    pip install /local_imports/voltha-protos/dist/*.tar.gz ; \
+    pip install /local_imports/voltha-protos/dist/*.tar.gz==* ; \
 fi
 
 # Bundle app source
diff --git a/python/docker/Dockerfile.cli b/python/docker/Dockerfile.cli
index fa9e845..11a3a81 100644
--- a/python/docker/Dockerfile.cli
+++ b/python/docker/Dockerfile.cli
@@ -15,7 +15,21 @@
 
 # Update to have latest images
 RUN apt-get update && \
-    apt-get install -y python openssl iproute2 libpcap-dev wget build-essential git binutils python-dev libffi-dev libssl-dev
+    apt-get install -y --no-install-recommends \
+        ca-certificates=20170717~16.04.2 \
+        python=2.7.12-1~16.04 \
+        openssl=1.0.2g-1ubuntu4.15 \
+        iproute2=4.3.0-1ubuntu3.16.04.5 \
+        libpcap-dev=1.7.4-2 \
+        wget=1.17.1-1ubuntu1.5 \
+        build-essential=12.1ubuntu2 \
+        git=1:2.7.4-0ubuntu1.6 \
+        binutils=2.26.1-1ubuntu1~16.04.8 \
+        python-dev=2.7.12-1~16.04 \
+        libffi-dev=3.2.1-4 \
+        libssl-dev=1.0.2g-1ubuntu4.15 \
+	openssh-server=1:7.2p2-4ubuntu2.8 \
+        && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install current version of pip rather than outdated pip from apt
 RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
@@ -29,11 +43,11 @@
 ARG LOCAL_PROTOS
 COPY local_imports/ /local_imports/
 RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
-    pip install /local_imports/pyvoltha/dist/*.tar.gz ; \
+    pip install /local_imports/pyvoltha/dist/*.tar.gz==* ; \
 fi
 
 RUN if [ -n "$LOCAL_PROTOS" ] ; then \
-    pip install /local_imports/voltha-protos/dist/*.tar.gz ; \
+    pip install /local_imports/voltha-protos/dist/*.tar.gz==* ; \
 fi
 
 # Bundle app source
@@ -44,12 +58,11 @@
 RUN touch /voltha/python/cli/__init__.py
 
 # Setup the voltha user
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN useradd -b /home -d /home/voltha voltha -s /bin/bash
 RUN mkdir /home/voltha
 RUN chown voltha.voltha /home/voltha
 RUN echo "voltha:admin" | chpasswd
-RUN apt-get update && apt-get install -y openssh-server
-RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN echo 'root:screencast' | chpasswd
 RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
diff --git a/python/docker/Dockerfile.ofagent b/python/docker/Dockerfile.ofagent
index 2037fa0..d5717ff 100644
--- a/python/docker/Dockerfile.ofagent
+++ b/python/docker/Dockerfile.ofagent
@@ -15,7 +15,20 @@
 
 # Update to have latest images
 RUN apt-get update && \
-    apt-get install -y python openssl iproute2 libpcap-dev wget build-essential git binutils python-dev libffi-dev libssl-dev
+    apt-get install -y --no-install-recommends \
+        ca-certificates=20170717~16.04.2 \
+	python=2.7.12-1~16.04 \
+	openssl=1.0.2g-1ubuntu4.15 \
+	iproute2=4.3.0-1ubuntu3.16.04.5 \
+	libpcap-dev=1.7.4-2 \
+	wget=1.17.1-1ubuntu1.5 \
+	build-essential=12.1ubuntu2 \
+	git=1:2.7.4-0ubuntu1.6 \
+	binutils=2.26.1-1ubuntu1~16.04.8 \
+	python-dev=2.7.12-1~16.04 \
+	libffi-dev=3.2.1-4 \
+	libssl-dev=1.0.2g-1ubuntu4.15 \
+	&& apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install current version of pip rather than outdated pip from apt
 RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
@@ -29,16 +42,16 @@
 ARG LOCAL_PROTOS
 COPY local_imports/ /local_imports/
 RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
-    pip install /local_imports/pyvoltha/dist/*.tar.gz ; \
+    pip install /local_imports/pyvoltha/dist/*.tar.gz==* ; \
 fi
 
 RUN if [ -n "$LOCAL_PROTOS" ] ; then \
-    pip install /local_imports/voltha-protos/dist/*.tar.gz ; \
+    pip install /local_imports/voltha-protos/dist/*.tar.gz==* ; \
 fi
 
 # Bundle app source
 RUN mkdir /ofagent  && \
-        touch   /ofagent/__init__.py 
+        touch   /ofagent/__init__.py
 
 ENV PYTHONPATH=/ofagent
 COPY ofagent /ofagent/ofagent