diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index a2dda2d..1b912e0 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -27,6 +27,7 @@
 RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
     dpkg -i *.deb && \
     rm -f *.deb && \
+    apt-get update && \
     apt-get install -y wget build-essential make gcc binutils python-dev libffi-dev libssl-dev git && \
     pip install -r /tmp/requirements.txt && \
     apt-get purge -y wget build-essential make gcc binutils python-dev libffi-dev libssl-dev git && \
diff --git a/docker/Dockerfile.cli_d b/docker/Dockerfile.cli_d
index 6def7e2..5bdf0e2 100755
--- a/docker/Dockerfile.cli_d
+++ b/docker/Dockerfile.cli_d
@@ -20,6 +20,8 @@
 
 MAINTAINER Voltha Community <info@opennetworking.org>
 
+RUN apt-get update && apt-get install -y openssh-server
+
 # Bundle app source
 RUN mkdir /cli && touch /cli/__init__.py
 ENV PYTHONPATH=/cli
@@ -33,8 +35,7 @@
 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/docker/Dockerfile.protos b/docker/Dockerfile.protos
index 745e166..94bd4ed 100644
--- a/docker/Dockerfile.protos
+++ b/docker/Dockerfile.protos
@@ -35,6 +35,11 @@
 WORKDIR /protos/asfvolt16_olt
 RUN make -f Makefile.protos build
 
+COPY voltha/adapters/openolt/protos/*.proto /protos/openolt/
+COPY docker/config/Makefile.protos /protos/openolt/Makefile.protos
+WORKDIR /protos/openolt
+RUN make -f Makefile.protos build
+
 # Copy the files to a scrach based container to minimize its size
 FROM ${REGISTRY}scratch
 COPY --from=builder /protos/ /protos/
diff --git a/docker/Dockerfile.voltha_d b/docker/Dockerfile.voltha_d
index 0032232..a8ab938 100644
--- a/docker/Dockerfile.voltha_d
+++ b/docker/Dockerfile.voltha_d
@@ -31,6 +31,7 @@
 COPY --from=protos /protos/voltha /voltha/voltha/protos
 COPY --from=protos /protos/google/api /voltha/voltha/protos/third_party/google/api
 COPY --from=protos /protos/asfvolt16_olt /voltha/voltha/adapters/asfvolt16_olt/protos
+COPY --from=protos /protos/openolt /voltha/voltha/adapters/openolt/protos
 
 # Exposing process and default entry point
 # EXPOSE 8000