diff --git a/compose/docker-compose-docutests.yml b/compose/docker-compose-docutests.yml
index 6a0db8c..2bfdbaa 100644
--- a/compose/docker-compose-docutests.yml
+++ b/compose/docker-compose-docutests.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
+    image: "wurstmeister/zookeeper:latest"
     ports:
     - 2181
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
+    image: "wurstmeister/kafka:latest"
     ports:
      - 9092
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
+    image: "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: "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: "fluent/fluentd:latest"
     ports:
     - "24224:24224"
     volumes:
@@ -75,7 +75,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+    image: "voltha/voltha:latest"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -115,7 +115,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+    image: "voltha/ofagent:latest"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -140,7 +140,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+    image: "voltha/netconf:latest"
     privileged: true
     command: [
       "/netconf/netconf/main.py",