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: