diff --git a/Makefile b/Makefile
index eb5039adf..7b768cdc4 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ REGISTRYSERVER=
 REGISTRYPROJECTNAME=vmware
 DEVFLAG=true
 NOTARYFLAG=false
-REGISTRYVERSION=photon-2.6.0
+REGISTRYVERSION=2.6.1-photon
 NGINXVERSION=1.11.5-patched
 PHOTONVERSION=1.0
 NOTARYVERSION=server-0.5.0
diff --git a/docs/user_guide.md b/docs/user_guide.md
index e45bca95e..287fc6c44 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -220,7 +220,7 @@ Run the below commands on the host which Harbor is deployed on to preview what f
 ```sh
 $ docker-compose stop
 
-$ docker run -it --name gc --rm --volumes-from registry vmware/registry:photon-2.6.0 garbage-collect --dry-run /etc/registry/config.yml
+$ docker run -it --name gc --rm --volumes-from registry vmware/registry:2.6.1-photon garbage-collect --dry-run /etc/registry/config.yml
 
 ```  
 **NOTE:** The above option "--dry-run" will print the progress without removing any data.  
@@ -229,7 +229,7 @@ Verify the result of the above test, then use the below commands to perform garb
 
 ```sh
 
-$ docker run -it --name gc --rm --volumes-from registry vmware/registry:photon-2.6.0 garbage-collect  /etc/registry/config.yml
+$ docker run -it --name gc --rm --volumes-from registry vmware/registry:2.6.1-photon garbage-collect  /etc/registry/config.yml
 
 $ docker-compose start
 ```  
diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml
index 3b1b80906..6f54d5757 100644
--- a/make/dev/docker-compose.yml
+++ b/make/dev/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     networks:
       - harbor
   registry:
-    image: vmware/registry:photon-2.6.0
+    image: vmware/registry:2.6.1-photon
     container_name: registry
     restart: always
     volumes:
diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index bf59cd84c..22eba44f7 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -11,7 +11,7 @@ services:
     networks:
       - harbor
   registry:
-    image: vmware/registry:photon-2.6.0
+    image: vmware/registry:2.6.1-photon
     container_name: registry
     restart: always
     volumes:
diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml
index 253d63014..cf5c3c6dc 100644
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   registry:
-    image: library/registry:2.6.0
+    image: vmware/registry:2.6.1-photon
     restart: always
     volumes:
       - /data/registry:/storage