diff --git a/Makefile b/Makefile
index 797cca15e..2246ebe0b 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ REGISTRYSERVER=
 REGISTRYPROJECTNAME=vmware
 DEVFLAG=true
 NOTARYFLAG=false
-REGISTRYVERSION=2.6.0
+REGISTRYVERSION=photon-2.6.0
 NGINXVERSION=1.11.5
 PHOTONVERSION=1.0
 NOTARYVERSION=server-0.5.0
@@ -262,7 +262,7 @@ build: build_$(BASEIMAGE)
 modify_composefile: 
 	@echo "preparing docker-compose file..."
 	@cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
-	@$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
+	@$(SEDCMD) -i 's/__version__/$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
 	
 install: compile build prepare modify_composefile start
 	
@@ -318,7 +318,7 @@ package_offline: compile build modify_composefile
 		$(DOCKERIMAGENAME_LOG):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
-		nginx:$(NGINXVERSION) registry:$(REGISTRYVERSION) photon:$(PHOTONVERSION) \
+		nginx:$(NGINXVERSION) vmware/registry:$(REGISTRYVERSION) photon:$(PHOTONVERSION) \
 		vmware/notary-photon:$(NOTARYVERSION) vmware/notary-photon:$(NOTARYSIGNERVERSION) mariadb:$(MARIADBVERSION); \
 	else \
 		$(DOCKERSAVE) -o $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \
diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index 41c929e86..9ffaca049 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -1,7 +1,7 @@
 version: '2'
 services:
   log:
-    image: vmware/harbor-log
+    image: vmware/harbor-log:__version__
     container_name: harbor-log 
     restart: always
     volumes:
@@ -31,7 +31,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "registry"
   mysql:
-    image: vmware/harbor-db
+    image: vmware/harbor-db:__version__
     container_name: harbor-db
     restart: always
     volumes:
@@ -48,7 +48,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "mysql"
   adminserver:
-    image: vmware/harbor-adminserver
+    image: vmware/harbor-adminserver:__version__
     container_name: harbor-adminserver
     env_file:
       - ./common/config/adminserver/env
@@ -66,7 +66,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "adminserver"
   ui:
-    image: vmware/harbor-ui
+    image: vmware/harbor-ui:__version__
     container_name: harbor-ui
     env_file:
       - ./common/config/ui/env
@@ -88,7 +88,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "ui"
   jobservice:
-    image: vmware/harbor-jobservice
+    image: vmware/harbor-jobservice:__version__
     container_name: harbor-jobservice
     env_file:
       - ./common/config/jobservice/env