diff --git a/hyperledger/README.md b/hyperledger/README.md
index 7d971b03..cd6099b3 100644
--- a/hyperledger/README.md
+++ b/hyperledger/README.md
@@ -9,12 +9,13 @@ $ bash setupPbft.sh
 ## Download Images
 If you want to start it manually, follow the steps:
 
-First,  pull necessary images first. 
+First,  pull necessary images first. You can ignore this step if pulling official image already.
 
 ```sh
-$ docker pull yeasy/hyperledger:latest && docker tag yeasy/hyperledger:latest hyperledger/fabric-baseimage:latest
-$ docker pull yeasy/hyperledger-peer:latest
-$ docker pull yeasy/hyperledger-membersrvc:latest
+$ docker pull yeasy/hyperledger-fabric:latest
+$ docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-peer:latest
+$ docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-baseimage:latest
+$ docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-membersrvc:latest
 ```
 
 ### Start 4 Noops node cluster
diff --git a/hyperledger/noops/docker-compose-with-membersrvc.yml b/hyperledger/noops/docker-compose-with-membersrvc.yml
index fddf46cc..78791de7 100644
--- a/hyperledger/noops/docker-compose-with-membersrvc.yml
+++ b/hyperledger/noops/docker-compose-with-membersrvc.yml
@@ -9,7 +9,7 @@
 # https://github.com/yeasy/docker-compose-files
 
 membersrvc:
-  image: yeasy/hyperledger-membersrvc:latest
+  image: hyperledger/fabric-membersrvc:latest
   restart: unless-stopped
   expose:
     - "7054"
@@ -36,7 +36,7 @@ vp0:
     - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054
   ports:
     - "7050:7050"
-    #- "7051:7051"
+    - "7051:7051"
   links:
     - membersrvc
   command: sh -c "sleep 5; peer node start"
diff --git a/hyperledger/noops/peer-noops.yml b/hyperledger/noops/peer-noops.yml
index 7c61e7a3..40e16c31 100644
--- a/hyperledger/noops/peer-noops.yml
+++ b/hyperledger/noops/peer-noops.yml
@@ -2,13 +2,13 @@
 # Notice that chaincode is executed inside docker in default net mode
 # https://github.com/yeasy/docker-compose-files
 
-# Depends on the yeasy/hyperledger-peer:noops image
+# Depends on the hyperledger/fabric-peer image
 
 # This utilizes the noops as consensus
 # See https://github.com/hyperledger/fabric/blob/master/docs/dev-setup/devnet-setup.md#using-consensus-plugin for more details.
 
 vp:
-  image: yeasy/hyperledger-peer:latest
+  image: hyperledger/fabric-peer:latest
   restart: unless-stopped
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
diff --git a/hyperledger/pbft/docker-compose-with-membersrvc.yml b/hyperledger/pbft/docker-compose-with-membersrvc.yml
index 3cb99e67..e8ff934b 100644
--- a/hyperledger/pbft/docker-compose-with-membersrvc.yml
+++ b/hyperledger/pbft/docker-compose-with-membersrvc.yml
@@ -9,7 +9,7 @@
 # https://github.com/yeasy/docker-compose-files
 
 membersrvc:
-  image: yeasy/hyperledger-membersrvc:latest
+  image: hyperledger/fabric-membersrvc:latest
   restart: unless-stopped
   expose:
     - "7054"
@@ -29,7 +29,7 @@ vp0:
     - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
   ports:
     - "7050:7050"
-    #- "7051:7051"
+    - "7051:7051"
   links:
     - membersrvc
   command: sh -c "sleep 5; peer node start"
diff --git a/hyperledger/pbft/peer-pbft.yml b/hyperledger/pbft/peer-pbft.yml
index fe6f215f..3fa2dabc 100644
--- a/hyperledger/pbft/peer-pbft.yml
+++ b/hyperledger/pbft/peer-pbft.yml
@@ -2,13 +2,13 @@
 # Notice that chaincode is executed inside docker in default net mode
 # https://github.com/yeasy/docker-compose-files
 
-# Depends on the yeasy/hyperledger-peer:pbft image
+# Depends on the hyperledger/fabric-peer image.
 
 # This utilized the pbft as consensus
 # See https://github.com/hyperledger/fabric/blob/master/docs/dev-setup/devnet-setup.md#using-consensus-plugin for more details.
 
 vp:
-  image: yeasy/hyperledger-peer:latest
+  image: hyperledger/fabric-peer:latest
   restart: unless-stopped
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
@@ -36,4 +36,4 @@ vp_sec:
     - CORE_SECURITY_ENABLED=true
     - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054
     - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054
-    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054
\ No newline at end of file
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054
diff --git a/hyperledger/setupPbft.sh b/hyperledger/setupPbft.sh
index ab68a43a..8494ab8e 100644
--- a/hyperledger/setupPbft.sh
+++ b/hyperledger/setupPbft.sh
@@ -19,9 +19,10 @@ curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose
 chmod +x /usr/local/bin/docker-compose
 docker-compose --version
 
-docker pull yeasy/hyperledger:latest && docker tag yeasy/hyperledger:latest hyperledger/fabric-baseimage:latest
-docker pull yeasy/hyperledger-peer:latest
-docker pull yeasy/hyperledger-membersrvc:latest
+docker pull yeasy/hyperledger-fabric:latest \
+    && docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-peer:latest \
+    && docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-baseimage:latest \
+    && docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-membersrvc:latest
 
 cd pbft
 docker-compose up