diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 2f801c2..0d4568a 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -5,7 +5,7 @@
   # Single-node consul agent
   #
   vconsul:
-    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"
@@ -21,7 +21,7 @@
   # Registrator
   #
   registrator:
-    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
+    image: "${REGISTRY}gliderlabs/registrator:latest"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -38,7 +38,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes:
@@ -50,7 +50,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-voltha${TAG}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -86,7 +86,7 @@
     - ponmgmt
 
   envoy:
-    image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-envoy${TAG}"
     entrypoint:
       - /usr/local/bin/envoyd
       - -envoy-cfg-template
@@ -115,7 +115,7 @@
   # Voltha cli container
   #
   cli:
-    image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-cli${TAG}"
     command: [
       "/cli/cli/setup.sh",
       "-L",
@@ -132,7 +132,7 @@
   # onos-1
   #
   onos1:
-    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos${TAG}"
     container_name: onos1
     ports:
     - 6633:6653
@@ -148,7 +148,7 @@
   # onos-2
   #
   onos2:
-    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos${TAG}"
     container_name: onos2
     ports:
     - 6644:6653
@@ -164,7 +164,7 @@
   # onos-3
   #
   onos3:
-    image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-onos${TAG}"
     container_name: onos3
     ports:
     - 6655:6653
@@ -179,7 +179,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
     command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --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:
     - vconsul