diff --git a/stacks/dockercoins+gelf.yml b/stacks/dockercoins+gelf.yml
index 95911591..215a7423 100644
--- a/stacks/dockercoins+gelf.yml
+++ b/stacks/dockercoins+gelf.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   rng:
     build: dockercoins/rng
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}rng${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/rng:${TAG-latest}
     logging:
       driver: gelf
       options:
@@ -13,7 +13,7 @@ services:
 
   hasher:
     build: dockercoins/hasher
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}hasher${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/hasher:${TAG-latest}
     logging:
       driver: gelf
       options:
@@ -21,7 +21,7 @@ services:
 
   webui:
     build: dockercoins/webui
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}webui${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/webui:${TAG-latest}
     logging:
       driver: gelf
       options:
@@ -38,7 +38,7 @@ services:
 
   worker:
     build: dockercoins/worker
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}worker${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/worker:${TAG-latest}
     logging:
       driver: gelf
       options:
diff --git a/stacks/dockercoins.yml b/stacks/dockercoins.yml
index aced6133..1edb6b99 100644
--- a/stacks/dockercoins.yml
+++ b/stacks/dockercoins.yml
@@ -3,17 +3,17 @@ version: "3"
 services:
   rng:
     build: dockercoins/rng
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}rng${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/rng:${TAG-latest}
     deploy:
       mode: global
 
   hasher:
     build: dockercoins/hasher
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}hasher${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/hasher:${TAG-latest}
 
   webui:
     build: dockercoins/webui
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}webui${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/webui:${TAG-latest}
     ports:
     - "8000:80"
 
@@ -22,7 +22,7 @@ services:
 
   worker:
     build: dockercoins/worker
-    image: ${REGISTRY_SLASH-127.0.0.1:5000/}worker${COLON_TAG-:latest}
+    image: ${REGISTRY-127.0.0.1:5000}/worker:${TAG-latest}
     deploy:
       replicas: 10