diff --git a/compose/docker-compose-auth-test.yml b/compose/docker-compose-auth-test.yml
index c4d4fc7..f5d4b67 100644
--- a/compose/docker-compose-auth-test.yml
+++ b/compose/docker-compose-auth-test.yml
@@ -3,7 +3,7 @@
 services:
 
  freeradius:
-  image: "marcelmaatkamp/freeradius"
+   image: "${REGISTRY}marcelmaatkamp/freeradius:${RADIUS_TAG:-latest}"
   ports:
    - "1812:1812/udp"
    - "1813:1813"
@@ -16,7 +16,7 @@
     ipv4_address: 172.25.0.100
 
  onos:
-  image: "cord/onos"
+  image: "${REGISTRY}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: onos-config-push:phase2
+#  image: "${REGISTRY}onos-config-push:${TAG:-latest}"
 #  environment:
 #   ONOS_CONNECTION: 'onos:8181'
 #  volumes:
@@ -39,7 +39,7 @@
 #   - "onos:onos"
 
 # freeradius-test:
-#  image: "marcelmaatkamp/freeradius"
+#  image: "${REGISTRY}marcelmaatkamp/freeradius:${RADIUS_TAG:-latest}"
 #  command: "radtest user password freeradius 0 SECRET"
 #  networks:
 #   authnet: