VOL-595 - container image name consistency and general cleanup

Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/compose/docker-compose-stats-swarm.yml b/compose/docker-compose-stats-swarm.yml
index 447be5c..5120e8a 100644
--- a/compose/docker-compose-stats-swarm.yml
+++ b/compose/docker-compose-stats-swarm.yml
@@ -15,7 +15,7 @@
 version: "3"
 services:
   dashd:
-    image: cord/dashd
+    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
     logging:
       driver: "json-file"
       options:
@@ -34,7 +34,7 @@
       - voltha-net
 
   shovel:
-    image: cord/shovel
+    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
     logging:
       driver: "json-file"
       options: