diff --git a/python/Makefile b/python/Makefile
index 737ae89..0276a91 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -111,7 +111,7 @@
 	@echo "adapter_ponsim_olt       : Build the ponsim olt adapter docker container"
 	@echo "adapter_ponsim_onu       : Build the ponsim olt adapter docker container"
 	@echo "adapter_openolt       : Build the openolt adapter docker container"
-	@echo "ofagent      : Build the openolt adapter docker container"
+	@echo "ofagent      : Build the openflow agent docker container"
 	@echo "tag          : Tag a set of images"
 	@echo "push         : Push the docker images to an external repository"
 	@echo "pull         : Pull the docker images from a repository"
@@ -146,7 +146,7 @@
 
 build: protoc protos containers
 
-containers: base adapter_ponsim_olt adapter_ponsim_onu adapter_openolt ofagent
+containers: base adapter_ponsim_olt adapter_ponsim_onu adapter_openolt ofagent cli
 
 base:
 	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-base:${TAG} -f docker/Dockerfile.base .
diff --git a/python/docker/Dockerfile.ofagent b/python/docker/Dockerfile.ofagent
index 48b4728..dee28ed 100644
--- a/python/docker/Dockerfile.ofagent
+++ b/python/docker/Dockerfile.ofagent
@@ -15,6 +15,7 @@
 ARG REGISTRY=
 ARG REPOSITORY=
 
+FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Voltha Community <info@opennetworking.org>
@@ -33,11 +34,16 @@
     rm -f *.deb
 
 # Bundle app source
-RUN mkdir /ofagent && touch /ofagent/__init__.py
+RUN mkdir -p /ofagent/ofagent/protos/third_party/google/api  && \
+        touch   /ofagent/__init__.py \
+                /ofagent/ofagent/protos/third_party/google/__init__.py \
+                /ofagent/ofagent/protos/third_party/google/api/__init__.py
 ENV PYTHONPATH=/ofagent
 COPY common /ofagent/common
 COPY ofagent /ofagent/ofagent
 COPY pki /ofagent/pki
+COPY --from=protos /protos/voltha /ofagent/ofagent/protos
+COPY --from=protos /protos/google/api /ofagent/ofagent/protos/third_party/google/api
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]