diff --git a/Makefile b/Makefile
index 170bbd9..46758e4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,12 @@
        --build-arg FTP_PROXY=$(FTP_PROXY) \
        --build-arg NO_PROXY=$(NO_PROXY)
 endif
-DOCKER_BUILD_ARGS = --build-arg TAG=$(TAG) $(DOCKER_PROXY_ARGS) $(DOCKER_CACHE_ARG) --rm --force-rm $(DOCKER_BUILD_EXTRA_ARGS)
+DOCKER_BUILD_ARGS = --build-arg TAG=$(TAG) \
+	--build-arg REGISTRY=$(REGISTRY) \
+	--build-arg REPOSITORY=$(REPOSITORY) \
+	$(DOCKER_PROXY_ARGS) $(DOCKER_CACHE_ARG) \
+	 --rm --force-rm \
+	$(DOCKER_BUILD_EXTRA_ARGS)
 
 VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
 
@@ -122,86 +127,86 @@
 containers: docker-base voltha ofagent netconf shovel onos tester config-push dashd cli portainer grafana nginx consul tools golang envoyd envoy fluentd unum j2
 
 docker-base:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/voltha-base:$(TAG) -f docker/Dockerfile.base .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-base:${TAG} -f docker/Dockerfile.base .
 
 voltha: voltha-adapters
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/voltha:$(TAG) -f docker/Dockerfile.voltha .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-voltha:${TAG} -f docker/Dockerfile.voltha .
 
 voltha-adapters:
 	make -C voltha/adapters/asfvolt16_olt
 
 ofagent:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/ofagent:$(TAG) -f docker/Dockerfile.ofagent .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG} -f docker/Dockerfile.ofagent .
 
 tools:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/tools:$(TAG) -f docker/Dockerfile.tools .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-tools:${TAG} -f docker/Dockerfile.tools .
 
 fluentd:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/fluentd:$(TAG) -f docker/Dockerfile.fluentd .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG} -f docker/Dockerfile.fluentd .
 
 envoy:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/envoy:$(TAG) -f docker/Dockerfile.envoy .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-envoy:${TAG} -f docker/Dockerfile.envoy .
 
 envoyd:
 	make -C envoy
 	make -C envoy/go/envoyd
 
 golang:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/go-builder:$(TAG) -f envoy/go/golang-builder/Dockerfile ./envoy/go/golang-builder
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-go-builder:${TAG} -f envoy/go/golang-builder/Dockerfile ./envoy/go/golang-builder
 
 netconf:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/netconf:$(TAG) -f docker/Dockerfile.netconf .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-netconf:${TAG} -f docker/Dockerfile.netconf .
 
 netopeer:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/netopeer:$(TAG) -f docker/Dockerfile.netopeer .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-netopeer:${TAG} -f docker/Dockerfile.netopeer .
 
 shovel:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/shovel:$(TAG) -f docker/Dockerfile.shovel .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-shovel:${TAG} -f docker/Dockerfile.shovel .
 
 dashd:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/dashd:$(TAG) -f docker/Dockerfile.dashd .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-dashd:${TAG} -f docker/Dockerfile.dashd .
 
 cli:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/cli:$(TAG) -f docker/Dockerfile.cli .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-cli:${TAG} -f docker/Dockerfile.cli .
 
 portainer:
-	portainer/buildPortainer.sh
+	REGISTRY=${REGISTRY} REPOSITORY=${REPOSITORY} TAG=${TAG} portainer/buildPortainer.sh
 
 nginx:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/nginx:$(TAG) -f docker/Dockerfile.nginx .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-nginx:${TAG} -f docker/Dockerfile.nginx .
 
 consul:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/consul:$(TAG) -f docker/Dockerfile.consul .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-consul:${TAG} -f docker/Dockerfile.consul .
 
 grafana:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/grafana:$(TAG) -f docker/Dockerfile.grafana .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-grafana:${TAG} -f docker/Dockerfile.grafana .
 
 onos:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/onos:$(TAG) -f docker/Dockerfile.onos docker
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-onos:${TAG} -f docker/Dockerfile.onos docker
 
 unum:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/unum:$(TAG) -f unum/Dockerfile ./unum
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-unum:${TAG} -f unum/Dockerfile ./unum
 
 tester:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/tester:$(TAG) -f docker/Dockerfile.tester docker
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-tester:${TAG} -f docker/Dockerfile.tester docker
 
 config-push:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/config-push:$(TAG) -f docker/Dockerfile.configpush docker
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-config-push:${TAG} -f docker/Dockerfile.configpush docker
 
 opennms:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/opennms:$(TAG) -f docker/Dockerfile.opennms .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-opennms:${TAG} -f docker/Dockerfile.opennms .
 
 logstash:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/logstash:$(TAG) -f docker/Dockerfile.logstash .
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-logstash:${TAG} -f docker/Dockerfile.logstash .
 
 j2:
-	docker build $(DOCKER_BUILD_ARGS) -t voltha/j2:$(TAG) -f docker/Dockerfile.j2 docker
+	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-j2:${TAG} -f docker/Dockerfile.j2 docker
 
 start:
 	bash -c 'echo $$VOLTHA_LOGS &&  TMP_STACK_FILE=$$(mktemp -u) && \
 		echo $$TMP_STACK_FILE && \
 		SWARM_MANAGER_COUNT=$$(docker node ls | grep Ready | egrep "(Leader)|(Reachable)" | wc -l | sed -e "s/ //g") && \
-	        cat ./compose/voltha-stack.yml.j2 2>&1 | docker run -e RADIUS_ROOT=$$RADIUS_ROOT -e CONSUL_ROOT=$$CONSUL_ROOT -e VOLTHA_LOGS=$$VOLTHA_LOGS -e SWARM_MANAGER_COUNT=$$SWARM_MANAGER_COUNT --rm -i voltha/j2 - 2>&1 > $$TMP_STACK_FILE && \
+		cat ./compose/voltha-stack.yml.j2 2>&1 | docker run -e RADIUS_ROOT=$$RADIUS_ROOT -e CONSUL_ROOT=$$CONSUL_ROOT -e VOLTHA_LOGS=$$VOLTHA_LOGS -e SWARM_MANAGER_COUNT=$$SWARM_MANAGER_COUNT --rm -i ${REGISTRY}${REPOSITORY}voltha-j2:${TAG} - 2>&1 > $$TMP_STACK_FILE && \
 	        docker stack deploy -c $$TMP_STACK_FILE voltha && \
 	        rm -f $$TMP_STACK_FILE'
 
@@ -225,13 +230,13 @@
 
 fetch-jenkins:
 	docker pull consul:0.9.2
-	docker pull fluent/fluentd:v0.14.23.rc1
+	docker pull fluent/fluentd:v0.12.42
 	docker pull ubuntu:xenial
 	docker pull wurstmeister/kafka:1.0.0
 	docker pull zookeeper:3.4.11
 fetch:
 	docker pull consul:0.9.2
-	docker pull fluent/fluentd:v0.14.23.rc1
+	docker pull fluent/fluentd:v0.12.42
 	docker pull ubuntu:xenial
 	docker pull wurstmeister/kafka:1.0.0
 	docker pull zookeeper:3.4.11
@@ -300,7 +305,7 @@
 
 
 run-as-root-tests:
-	docker run -i --rm -v /cord/incubator/voltha:/voltha --privileged voltha/voltha-base env PYTHONPATH=/voltha python /voltha/tests/itests/run_as_root/test_frameio.py
+	docker run -i --rm -v /cord/incubator/voltha:/voltha --privileged ${REGISTRY}${REPOSITORY}voltha-base:${TAG} env PYTHONPATH=/voltha python /voltha/tests/itests/run_as_root/test_frameio.py
 
 flake8: $(DIRS_FLAKE8)
 
diff --git a/compose/docker-compose-all.yml.j2 b/compose/docker-compose-all.yml.j2
index f358573..a66b6aa 100755
--- a/compose/docker-compose-all.yml.j2
+++ b/compose/docker-compose-all.yml.j2
@@ -17,7 +17,7 @@
   # The Fluentd container is part of the data collection
   # infrastructure.
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -71,7 +71,7 @@
   # The cluster manager must run on a manager node so that it can 
   # retrieve service information from manager nodes
   onos_cluster_manager:
-    image: "${REGISTRY}voltha/unum:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-unum:${TAG:-latest}"
     deploy:
       replicas: 1
       placement:
@@ -100,7 +100,7 @@
       replicas: 1
       labels:
         org.voltha.onos.cluster: "true"
-    image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -118,7 +118,7 @@
   # The VCORE container is the core capabilities of VOLTHA including
   # interacting with device adapters
   vcore:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -150,7 +150,7 @@
   # The OpenFlow Agent support the OpenFlow protocol communication
   # between ONOS and VOLTHA.
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -175,7 +175,7 @@
   # the VOLTHA components as well as surfaces a REST API and maps
   # the requests to GPRC
   voltha:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -202,7 +202,7 @@
   # The CLI container provides an CLI to the VOLTHA capabilitiy 
   # that can be accessed via SSH.
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -224,7 +224,7 @@
   # The Netconf container provides an NETCONF API to be used
   # with VOLTHA and maps that to GRPC requests
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -253,7 +253,7 @@
   # as other VOLTHA containers and is thus a convenient 
   # troubleshooting tool
   tools:
-    image: "${REGISTRY}voltha/tools:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-tools:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-auth-test.yml b/compose/docker-compose-auth-test.yml
index f5d4b67..c79babc 100644
--- a/compose/docker-compose-auth-test.yml
+++ b/compose/docker-compose-auth-test.yml
@@ -16,7 +16,7 @@
     ipv4_address: 172.25.0.100
 
  onos:
-  image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+  image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
   ports:
    - "8101:8101" # ssh
    - "6653:6653" # OF
@@ -28,7 +28,7 @@
      ipv4_address: 172.25.0.200
 
 # onos_config_push:
-#  image: "${REGISTRY}onos-config-push:${TAG:-latest}"
+#  image: "${REGISTRY}${REPOSITORY}onos-config-push:${TAG:-latest}"
 #  environment:
 #   ONOS_CONNECTION: 'onos:8181'
 #  volumes:
diff --git a/compose/docker-compose-cli.yml b/compose/docker-compose-cli.yml
index e980f51..403d06d 100644
--- a/compose/docker-compose-cli.yml
+++ b/compose/docker-compose-cli.yml
@@ -10,7 +10,7 @@
 version: "3"
 services:
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-dashd.yml b/compose/docker-compose-dashd.yml
index 3b5080d..7908450 100755
--- a/compose/docker-compose-dashd.yml
+++ b/compose/docker-compose-dashd.yml
@@ -4,7 +4,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd:${TAG:-latest}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
diff --git a/compose/docker-compose-docutests.yml b/compose/docker-compose-docutests.yml
index 2bfdbaa..de75f81 100644
--- a/compose/docker-compose-docutests.yml
+++ b/compose/docker-compose-docutests.yml
@@ -75,7 +75,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "voltha/voltha:latest"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:latest"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -115,7 +115,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "voltha/ofagent:latest"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:latest"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -140,7 +140,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "voltha/netconf:latest"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf:latest"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
diff --git a/compose/docker-compose-elasticsearch.yml b/compose/docker-compose-elasticsearch.yml
index 97f6176..72a3739 100644
--- a/compose/docker-compose-elasticsearch.yml
+++ b/compose/docker-compose-elasticsearch.yml
@@ -2,7 +2,7 @@
 
 services:
   elasticsearch:
-    image: "${REGISTRY}docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_TAG:-5.6.0}"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_TAG:-5.6.0}"
     environment:
       - transport.host=localhost
       - transport.tcp.port=9300
diff --git a/compose/docker-compose-envoy-swarm.yml b/compose/docker-compose-envoy-swarm.yml
index fc299e9..1e5d43d 100644
--- a/compose/docker-compose-envoy-swarm.yml
+++ b/compose/docker-compose-envoy-swarm.yml
@@ -10,7 +10,7 @@
 version: "3"
 services:
   voltha:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-fixed-port.yml b/compose/docker-compose-fixed-port.yml
index d3b1c85..cafe4ab 100644
--- a/compose/docker-compose-fixed-port.yml
+++ b/compose/docker-compose-fixed-port.yml
@@ -62,7 +62,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     ports:
     - "24224:24224"
     volumes:
@@ -93,7 +93,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel:${TAG:-latest}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -111,7 +111,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -154,7 +154,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -179,7 +179,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
@@ -207,7 +207,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd:${TAG:-latest}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
diff --git a/compose/docker-compose-fluentd-agg-cluster.yml b/compose/docker-compose-fluentd-agg-cluster.yml
index fceb6cf..59c86f6 100644
--- a/compose/docker-compose-fluentd-agg-cluster.yml
+++ b/compose/docker-compose-fluentd-agg-cluster.yml
@@ -13,7 +13,7 @@
 #
 
   fluentdactv:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -33,7 +33,7 @@
       - ${VOLTHA_LOGS:-/var/log/voltha/logging_volume}:/fluentd/log
 
   fluentdstby:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-fluentd-cluster.yml b/compose/docker-compose-fluentd-cluster.yml
index 18b9812..03ede60 100644
--- a/compose/docker-compose-fluentd-cluster.yml
+++ b/compose/docker-compose-fluentd-cluster.yml
@@ -13,7 +13,7 @@
 #
 
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-kafka-cluster.yml b/compose/docker-compose-kafka-cluster.yml
index 53fd141..0dc837e 100644
--- a/compose/docker-compose-kafka-cluster.yml
+++ b/compose/docker-compose-kafka-cluster.yml
@@ -23,7 +23,7 @@
                max-size: "10m"
                max-file: 3
         networks:
-            - net
+            - kafka-net
         environment:
             ZOO_MY_ID: 1
             ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zk2:2888:3888 server.3=zk3:2888:3888
@@ -36,7 +36,7 @@
                 max-size: "10m"
                 max-file: 3
         networks:
-            - net
+            - kafka-net
         environment:
             ZOO_MY_ID: 2
             ZOO_SERVERS: server.1=zk1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zk3:2888:3888
@@ -49,7 +49,7 @@
                 max-size: "10m"
                 max-file: 3
         networks:
-            - net
+            - kafka-net
         environment:
             ZOO_MY_ID: 3
             ZOO_SERVERS: server.1=zk1:2888:3888 server.2=zk2:2888:3888 server.3=0.0.0.0:2888:3888
@@ -70,16 +70,15 @@
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
         networks:
-            - net
+            - kafka-net
             - voltha-net
         ports:
             - 9092:9092
 
 networks:
-    net:
-        driver: overlay
-        driver_opts:
-           encrypted: "true"
+    kafka-net:
+        external:
+            name: kafka_net
 
     voltha-net:
         external:
diff --git a/compose/docker-compose-logstash-swarm.yml b/compose/docker-compose-logstash-swarm.yml
index 814ed9d..4ce3d31 100644
--- a/compose/docker-compose-logstash-swarm.yml
+++ b/compose/docker-compose-logstash-swarm.yml
@@ -2,7 +2,7 @@
 
 services:
   logstash:
-    image: "${REGISTRY}voltha/logstash:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-logstash:${TAG:-latest}"
     environment:
       - log.level=info
       - xpack.monitoring.enabled=false
diff --git a/compose/docker-compose-logstash.yml b/compose/docker-compose-logstash.yml
index 53a875f..09d126a 100644
--- a/compose/docker-compose-logstash.yml
+++ b/compose/docker-compose-logstash.yml
@@ -2,7 +2,7 @@
 
 services:
   logstash:
-    image: "${REGISTRY}voltha/logstash:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-logstash:${TAG:-latest}"
     environment:
       - log.level=info
     command: logstash -f /etc/logstash/conf.d/
diff --git a/compose/docker-compose-netconf-swarm.yml b/compose/docker-compose-netconf-swarm.yml
index 8df65ac..140c8c4 100644
--- a/compose/docker-compose-netconf-swarm.yml
+++ b/compose/docker-compose-netconf-swarm.yml
@@ -13,7 +13,7 @@
 version: "3"
 services:
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-netopeer.yml b/compose/docker-compose-netopeer.yml
index df00ec4..ece17ba 100755
--- a/compose/docker-compose-netopeer.yml
+++ b/compose/docker-compose-netopeer.yml
@@ -1,6 +1,6 @@
 version: '2'
 services:
   netopeer:
-    image: "${REGISTRY}voltha/netopeer:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netopeer:${TAG:-latest}"
     ports:
       - "1830:830"
diff --git a/compose/docker-compose-ofagent-swarm.yml b/compose/docker-compose-ofagent-swarm.yml
index ef0be02..5c0d0b8 100644
--- a/compose/docker-compose-ofagent-swarm.yml
+++ b/compose/docker-compose-ofagent-swarm.yml
@@ -9,7 +9,7 @@
 version: "3.2"
 services:
     ofagent:
-        image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+        image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
         logging:
             driver: "json-file"
             options:
diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index d20a6a5..20a4035 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -38,7 +38,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     ports:
     - "24224:24224"
     volumes:
@@ -50,7 +50,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -88,7 +88,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -113,7 +113,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -130,7 +130,7 @@
   # onos-1
   #
   onos1:
-    image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
     container_name: onos1
     ports:
     - 6633:6653
@@ -146,7 +146,7 @@
   # onos-2
   #
   onos2:
-    image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
     container_name: onos2
     ports:
     - 6644:6653
@@ -162,7 +162,7 @@
   # onos-3
   #
   onos3:
-    image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
     container_name: onos3
     ports:
     - 6655:6653
@@ -177,7 +177,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
     command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --fluentd=fluentd:24224 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name --enable-tls --key-file=/ofagent/pki/voltha.key --cert-file=/ofagent/pki/voltha.crt
     depends_on:
     - consul
diff --git a/compose/docker-compose-onos-swarm.yml b/compose/docker-compose-onos-swarm.yml
index d441cb0..570f4b2 100644
--- a/compose/docker-compose-onos-swarm.yml
+++ b/compose/docker-compose-onos-swarm.yml
@@ -29,7 +29,7 @@
             - voltha-net
 
     onos_cluster_manager:
-        image: "${REGISTRY}voltha/unum:${TAG:-latest}"
+        image: "${REGISTRY}${REPOSITORY}voltha-unum:${TAG:-latest}"
         deploy:
             replicas: 1
             placement:
@@ -52,7 +52,7 @@
            replicas: 3
            labels:
                org.voltha.onos.cluster: "true"
-        image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+        image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
         logging:
             driver: "json-file"
             options:
diff --git a/compose/docker-compose-opennms.yml b/compose/docker-compose-opennms.yml
index fe9b349..3fae37a 100644
--- a/compose/docker-compose-opennms.yml
+++ b/compose/docker-compose-opennms.yml
@@ -24,7 +24,7 @@
       - /var/opennms/reports
 
   opennms:
-    image: "${REGISTRY}voltha/opennms:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-opennms:${TAG:-latest}"
     env_file:
       - ./opennms/env/opennms.env
       - ./opennms/env/postgres.env
diff --git a/compose/docker-compose-stats-swarm.yml b/compose/docker-compose-stats-swarm.yml
index 5120e8a..6d4a673 100644
--- a/compose/docker-compose-stats-swarm.yml
+++ b/compose/docker-compose-stats-swarm.yml
@@ -15,7 +15,7 @@
 version: "3"
 services:
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -34,7 +34,7 @@
       - voltha-net
 
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/docker-compose-system-test-dispatcher.yml b/compose/docker-compose-system-test-dispatcher.yml
index d88517a..5865d60 100644
--- a/compose/docker-compose-system-test-dispatcher.yml
+++ b/compose/docker-compose-system-test-dispatcher.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
+    image: "${REGISTRY}consul:0.9.2"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
     ports:
     - "24224:24224"
     volumes:
@@ -76,7 +76,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-grafana${TAG}"
     ports:
     - "8883:80"
     - "2003:2003"
@@ -95,7 +95,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel${TAG}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -113,7 +113,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -151,7 +151,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy${TAG}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -176,7 +176,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -197,7 +197,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -222,7 +222,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf${TAG}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index aff19ca..57cd6fa 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}voltha/consul:${CONSUL_TAG:-0.9.2}"
+    image: "${REGISTRY}${REPOSITORY}voltha-consul${TAG}"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -66,7 +66,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
     ports:
     - "24224:24224"
     volumes:
@@ -79,7 +79,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-grafana${TAG}"
     ports:
     - "8882:80"
     - "2003:2003"
@@ -98,7 +98,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel${TAG}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -116,7 +116,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -155,7 +155,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L"
@@ -175,7 +175,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -200,7 +200,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf${TAG}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
@@ -228,7 +228,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd${TAG}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
@@ -247,7 +247,7 @@
   # Nginx service consolidation
   #
   nginx:
-    image: "${REGISTRY}voltha/nginx:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-nginx${TAG}"
     ports:
     - "80:80"
     environment:
@@ -261,13 +261,14 @@
     - portainer
     restart: unless-stopped
     volumes:
-    - "/home/cord/cord/incubator/voltha/nginx_config:/nginx_config"
+    - "/vagrant/nginx_config:/nginx_config"
+    #- "/home/cord/cord/incubator/voltha/nginx_config:/nginx_config"
 
   #
   # Docker ui
   #
   portainer:
-    image: "${REGISTRY}voltha/portainer:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-portainer${TAG}"
     ports:
     - "9000:9000"
     environment:
diff --git a/compose/docker-compose-system-test-persistence.yml b/compose/docker-compose-system-test-persistence.yml
index 963055c..18cfa43 100644
--- a/compose/docker-compose-system-test-persistence.yml
+++ b/compose/docker-compose-system-test-persistence.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
+    image: "${REGISTRY}consul:0.9.2"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
     ports:
     - "24224:24224"
     volumes:
@@ -76,7 +76,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-grafana${TAG}"
     ports:
     - "8883:80"
     - "2003:2003"
@@ -95,7 +95,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel${TAG}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -113,7 +113,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -151,7 +151,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy${TAG}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -176,7 +176,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -197,7 +197,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -222,7 +222,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf${TAG}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
diff --git a/compose/docker-compose-system-test-with-etcd.yml b/compose/docker-compose-system-test-with-etcd.yml
index b35d7cb..a3cc69c 100644
--- a/compose/docker-compose-system-test-with-etcd.yml
+++ b/compose/docker-compose-system-test-with-etcd.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
+    image: "${REGISTRY}consul:0.9.2"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Single-node etcd server
   #
   etcd:
-    image: "${REGISTRY}quay.io/coreos/etcd:${ETCD_TAG:-v3.2.9}"
+    image: "quay.io/coreos/etcd:v3.2.9"
     command: [
       "etcd",
       "--name=etcd0",
@@ -66,7 +66,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -83,7 +83,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
     ports:
     - "24224:24224"
     volumes:
@@ -96,7 +96,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-grafana${TAG}"
     ports:
     - "8883:80"
     - "2003:2003"
@@ -115,7 +115,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel${TAG}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -133,7 +133,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -174,7 +174,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy${TAG}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -207,7 +207,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -228,7 +228,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -256,7 +256,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf${TAG}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
@@ -284,7 +284,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd${TAG}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
@@ -303,7 +303,7 @@
   # Nginx service consolidation
   #
   nginx:
-    image: "${REGISTRY}voltha/nginx:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-nginx${TAG}"
     ports:
     - "80:80"
     environment:
@@ -321,7 +321,7 @@
   # Docker ui
   #
   portainer:
-    image: "${REGISTRY}voltha/portainer:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-portainer${TAG}"
     ports:
     - "9000:9000"
     environment:
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 7231ed9..99ffcd0 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "${REGISTRY}wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
+    image: "${REGISTRY}consul:0.9.2"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
     ports:
     - "24224:24224"
     volumes:
@@ -76,7 +76,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-grafana${TAG}"
     ports:
     - "8883:80"
     - "2003:2003"
@@ -95,7 +95,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-shovel${TAG}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -113,7 +113,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -151,7 +151,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy${TAG}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -176,7 +176,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -197,7 +197,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -225,7 +225,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf${TAG}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
@@ -253,7 +253,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-dashd${TAG}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
@@ -272,7 +272,7 @@
   # Nginx service consolidation
   #
   nginx:
-    image: "${REGISTRY}voltha/nginx:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-nginx${TAG}"
     ports:
     - "80:80"
     environment:
@@ -290,7 +290,7 @@
   # Docker ui
   #
   portainer:
-    image: "${REGISTRY}voltha/portainer:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-portainer${TAG}"
     ports:
     - "9000:9000"
     environment:
diff --git a/compose/docker-compose-voltha-swarm.yml b/compose/docker-compose-voltha-swarm.yml
index cbbe319..cd6489a 100644
--- a/compose/docker-compose-voltha-swarm.yml
+++ b/compose/docker-compose-voltha-swarm.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   vcore:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/voltha-stack.yml.j2 b/compose/voltha-stack.yml.j2
index 09033d4..77d5d9d 100644
--- a/compose/voltha-stack.yml.j2
+++ b/compose/voltha-stack.yml.j2
@@ -20,31 +20,35 @@
 #                 templating capability, because as of 17.09.0-ce Docker
 #                 cannot use and environment variable for the `replicas`
 #                 attribute on a container. ]
-# REGISTRY    - The docker registry from which images should be pulled.
-#               If specified if should end in a `/`. Defaults to empty.
-# TAG         - The tag that should be used when referencing VOLTHA docker
-#               images, defaults to `latest`.
-# CONSUL_ROOT - The local path on which the consul/data and consul/config
-#               directories should be created. Defaults to `/var/local`.
-# VOLTHA_LOGS - The location into which `fluentd` should writes logs.
-#               Defaults to `/var/log`.
-# RADIUS_ROOT - The location in which the `data/clients.conf` and 
-#               `data/users` configuration files can be found. Defaults
-#               to `/var/local`.
+# REGISTRY      - The docker registry host from which images should be
+#                 pulled, i.e. `private-reg.com:5000/`. If specified
+#                 it should end in a `/`. Defaults to empty.
+# REPOSITORY    - The docker repository name from which voltha specific
+#                 images should be pulled, i.e. `voltha/`. If specified it
+#                 should end in a `/`. Defaults to empty.
+# TAG           - The tag that should be used when referencing VOLTHA docker
+#                 images, defaults to `latest`.
+# CONSUL_ROOT   - The local path on which the consul/data and consul/config
+#                 directories should be created. Defaults to `/var/local`.
+# VOLTHA_LOGS   - The location into which `fluentd` should writes logs.
+#                 Defaults to `/var/log`.
+# RADIUS_ROOT   - The location in which the `data/clients.conf` and 
+#                 `data/users` configuration files can be found. Defaults
+#                 to `/var/local`.
 # DOCKER_HOST_IP -
-# ZK_TAG      - The tag that should be used when referencing the ZooKeeper
-#               docker image. Defaults to `3.4.11`.
-# KAFKA_TAG   - The tag that should be used when referencing the Kafka
-#               docker image. Default to `1.0.0`.
-# CONSUL_TAG  - The tag that should be used when referencing the Consul
-#               docker image. Defaults to `0.9.2`.
-# RADIUS_TAG  - The tag that should be used when referencing the FreeRADIUS
-#               docker image. Defaults to `latest`.
+# ZK_TAG        - The tag that should be used when referencing the ZooKeeper
+#                 docker image. Defaults to `latest`.
+# KAFKA_TAG     - The tag that should be used when referencing the Kafka
+#                 docker image. Default to `1.0.0`.
+# CONSUL_TAG    - The tag that should be used when referencing the Consul
+#                 docker image. Defaults to `0.9.2`.
+# RADIUS_TAG    - The tag that should be used when referencing the FreeRADIUS
+#                 docker image. Defaults to `latest`.
 version: "3"
 
 services:
   zk1:
-    image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -57,7 +61,7 @@
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zk2:2888:3888 server.3=zk3:2888:3888
 
   zk2:
-    image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -70,7 +74,7 @@
       ZOO_SERVERS: server.1=zk1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zk3:2888:3888
 
   zk3:
-    image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -85,7 +89,7 @@
   kafka:
     deploy:
       mode: global
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-1.0.0}"
+    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -104,7 +108,7 @@
       - 9092:9092
 
   consul:
-    image: ${REGISTRY}consul:${CONSUL_TAG:-0.9.2}
+    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
     logging:
       driver: "json-file"
       options:
@@ -152,7 +156,7 @@
 {%- endif %}
 
   fluentdactv:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -174,7 +178,7 @@
 {%- endif %}
 
   fluentdstby:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -198,7 +202,7 @@
   # The Fluentd container is part of the data collection
   # infrastructure.
   fluentd:
-    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -254,7 +258,7 @@
   # The cluster manager must run on a manager node so that it can 
   # retrieve service information from manager nodes
   onos_cluster_manager:
-    image: "${REGISTRY}voltha/unum:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-unum:${TAG:-latest}"
     deploy:
       replicas: 1
       placement:
@@ -283,7 +287,7 @@
       replicas: 1
       labels:
         org.voltha.onos.cluster: "true"
-    image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -301,7 +305,7 @@
   # The VCORE container is the core capabilities of VOLTHA including
   # interacting with device adapters
   vcore:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -333,7 +337,7 @@
   # The OpenFlow Agent support the OpenFlow protocol communication
   # between ONOS and VOLTHA.
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -358,7 +362,7 @@
   # the VOLTHA components as well as surfaces a REST API and maps
   # the requests to GPRC
   voltha:
-    image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -387,7 +391,7 @@
   # The CLI container provides an CLI to the VOLTHA capabilitiy 
   # that can be accessed via SSH.
   cli:
-    image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -411,7 +415,7 @@
   # The Netconf container provides an NETCONF API to be used
   # with VOLTHA and maps that to GRPC requests
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -440,7 +444,7 @@
   # as other VOLTHA containers and is thus a convenient 
   # troubleshooting tool
   tools:
-    image: "${REGISTRY}voltha/tools:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-tools:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
diff --git a/docker/Dockerfile.cli b/docker/Dockerfile.cli
index 0c04759..70757e4 100755
--- a/docker/Dockerfile.cli
+++ b/docker/Dockerfile.cli
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.dashd b/docker/Dockerfile.dashd
index 05cf57e..c33446f 100755
--- a/docker/Dockerfile.dashd
+++ b/docker/Dockerfile.dashd
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.fluentd b/docker/Dockerfile.fluentd
index ed5417c..c25c5ba 100644
--- a/docker/Dockerfile.fluentd
+++ b/docker/Dockerfile.fluentd
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 #DockerFile to Create Fluentd Forwards inside cord-voltha
-FROM fluent/fluentd:v0.14.23.rc1
+FROM fluent/fluentd:v0.12.42
 MAINTAINER Voltha Community <info@opennetworking.org>
 
 RUN apk add --update bash
diff --git a/docker/Dockerfile.netconf b/docker/Dockerfile.netconf
index b740aae..666750c 100644
--- a/docker/Dockerfile.netconf
+++ b/docker/Dockerfile.netconf
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx
index 33b8068..5910449 100755
--- a/docker/Dockerfile.nginx
+++ b/docker/Dockerfile.nginx
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.ofagent b/docker/Dockerfile.ofagent
index 733b9df..9ac0c05 100644
--- a/docker/Dockerfile.ofagent
+++ b/docker/Dockerfile.ofagent
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.shovel b/docker/Dockerfile.shovel
index 3a411fb..163a2ca 100644
--- a/docker/Dockerfile.shovel
+++ b/docker/Dockerfile.shovel
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.tester b/docker/Dockerfile.tester
index a9b1a10..ba7deb9 100644
--- a/docker/Dockerfile.tester
+++ b/docker/Dockerfile.tester
@@ -11,10 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
index 168ffee..dfc3e9d 100755
--- a/docker/Dockerfile.tools
+++ b/docker/Dockerfile.tools
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.voltha b/docker/Dockerfile.voltha
index ece248b..0b3853a 100644
--- a/docker/Dockerfile.voltha
+++ b/docker/Dockerfile.voltha
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/envoy/go/envoyd/build_binary.sh b/envoy/go/envoyd/build_binary.sh
index 5f8fc06..ff537a9 100755
--- a/envoy/go/envoyd/build_binary.sh
+++ b/envoy/go/envoyd/build_binary.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+TAG=${TAG:-latest}
+
 rm -fr buildreport
 rm -f envoyd
-docker run -e "http_proxy=$http_proxy" -e "https_proxy=$https_proxy" -v $(pwd):/src voltha/go-builder
+docker run -e "http_proxy=$http_proxy" -e "https_proxy=$https_proxy" -v $(pwd):/src ${REGISTRY}${REPOSITORY}voltha-go-builder:${TAG}
 #/build.sh
 uid=`id -u`
 gid=`id -g`
diff --git a/install/voltha-swarm-start.sh b/install/voltha-swarm-start.sh
index cbd69e3..2dce5ad 100755
--- a/install/voltha-swarm-start.sh
+++ b/install/voltha-swarm-start.sh
@@ -64,6 +64,8 @@
 # If `REGISTRY` is set, but doesn't end in a `/`, then
 # add one
 test -z "$REGISTRY" -o "$(echo ${REGISTRY: -1})" == "/" || REGISTRY="$REGISTRY/"
+test -z "$REPOSITORY" -o "$(echo ${REPOSITORY: -1})" == "/" || REGISTRY="$REPOSITORY/"
+TAG=${TAG:-latest}
 
 # Attempt to count Ready Docker Swarm managers
 export SWARM_MANAGER_COUNT=$(docker node ls | grep Ready | egrep '(Leader)|(Reachable)' | wc -l | sed -e 's/ //g')
@@ -146,6 +148,6 @@
 
 
 TMP_STACK_FILE=$(mktemp -u)
-cat $BASE_DIR/compose/docker-compose-all.yml.j2 2>&1 | docker run -e SWARM_MANAGER_COUNT=$SWARM_MANAGER_COUNT --rm -i voltha/j2 - 2>&1 > $TMP_STACK_FILE
+cat $BASE_DIR/compose/docker-compose-all.yml.j2 2>&1 | docker run -e SWARM_MANAGER_COUNT=$SWARM_MANAGER_COUNT --rm -i ${REGISTRY}${REPOSITORY}voltha-j2:${TAG} - 2>&1 > $TMP_STACK_FILE
 docker stack deploy -c $TMP_STACK_FILE voltha
 rm -f $TMP_STACK_FILE
diff --git a/install/voltha-swarm-stop.sh b/install/voltha-swarm-stop.sh
index ebb4aea..df8595a 100755
--- a/install/voltha-swarm-stop.sh
+++ b/install/voltha-swarm-stop.sh
@@ -28,7 +28,9 @@
 
 usage() {
     echo >&2 "$PROG: [-d <dir>] [-l <log-dir>] [-h]"
-    echo >&2 "  -z              zero out the consul data"
+    echo >&2 "  -z              zero out the consul fluentd data"
+    echo >&2 "  -l <log-dir>    directory from which fluentd logs will be removed"
+    echo >&2 "  -c <consul-dir> directory from which consul data is removed"
     echo >&2 "  -h              this message"
 }
 
@@ -39,6 +41,7 @@
     case "$OPT" in
         z) VOLUME_CLEANUP=1;;
         c) export CONSUL_ROOT="$OPTARG";;
+        l) export VOLTHA_LOGS="$OPTARG";;
         h) usage;
            exit 1;;
         esac
@@ -88,7 +91,7 @@
 
 # Attempt to count Ready Docker Swarm managers
 SWARM_MANAGER_COUNT=$(docker node ls | grep Ready | egrep '(Leader)|(Reachable)' | wc -l)
-echo -n "[volume] consul ... "
+echo -n "[cleanup] consul and fluentd ... "
 if [ $VOLUME_CLEANUP -ne 0 ]; then
     RUNNING=$(docker service ps volume_cleanup 2> /dev/null | wc -l)
     if [ $RUNNING -ne 0 ]; then
@@ -98,8 +101,9 @@
     --mode=global --name=volume_cleanup \
     --mount=type=bind,src=${CONSUL_ROOT:-/cord/incubator/voltha/consul}/data,dst=/consul/data \
     --mount=type=bind,src=${CONSUL_ROOT:-/cord/incubator/voltha/consul}/config,dst=/consul/config \
+    --mount=type=bind,src=${VOLTHA_LOGS:-/var/log/voltha/logging_volume},dst=/fluentd/log \
     alpine:latest \
-    ash -c 'rm -rf /consul/data/* /consul/config/*' > /dev/null
+    ash -c 'rm -rf /consul/data/* /consul/config/* /fluentd/log/*' > /dev/null
 
     RETRY=10
     while [ $RETRY -ge 0 ]; do
diff --git a/portainer/buildPortainer.sh b/portainer/buildPortainer.sh
index 57c503f..6d38763 100755
--- a/portainer/buildPortainer.sh
+++ b/portainer/buildPortainer.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+TAG=${TAG:-latest}
+
 docker run -d --name pbuild -p 9999:9000 portainer/portainer:1.15.2
 rm -fr tmp_portainer
 mkdir tmp_portainer
@@ -21,7 +23,7 @@
 s~"images/logo.png"~"docker/images/logo.png"~
 ' tmp_portainer/index.html
 
-docker build -t voltha/portainer -f docker/Dockerfile.portainer .
+docker build -t ${REGISTRY}${REPOSITORY}voltha-portainer:${TAG} -f docker/Dockerfile.portainer .
 rm -fr tmp_portainer
 docker stop pbuild
 docker rm -f pbuild
diff --git a/unum/Makefile b/unum/Makefile
index ce8c23c..1a39029 100644
--- a/unum/Makefile
+++ b/unum/Makefile
@@ -20,7 +20,7 @@
 	@echo "  rm        - remove the sample 3 instance cluster"
 
 image:
-	docker build --rm --tag voltha/unum:latest .
+	docker build --rm --tag ${REGISTRY}${REPOSITORY}unum:${TAG} .
 
 deploy:
 	docker stack deploy -c docker-compose.yml test