diff --git a/hyperledger/compose-defaults.yml b/hyperledger/compose-defaults.yml
index c90dd7ea..b956087b 100644
--- a/hyperledger/compose-defaults.yml
+++ b/hyperledger/compose-defaults.yml
@@ -14,20 +14,15 @@ vp:
     - CORE_PEER_NETWORKID=dev
     - CORE_LOGGING_LEVEL=debug  #critical, error, warning, notice, info, debug
     # The following section enables bpft consensus
-    - CORE_PEER_VALIDATOR_CONSENSUS=obcpbft  # noops, obcpbft, pbft
+    - CORE_PEER_VALIDATOR_CONSENSUS=pbft  # noops, obcpbft, pbft
     - CORE_PBFT_GENERAL_MODE=classic  # batch, classic, sieve
     - CORE_PBFT_GENERAL_N=4
     - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
-    # The following section enable member authentication, set follow to True
-    - CORE_SECURITY_ENABLED=false
-    - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
-    - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051
-    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051
   expose:
     - "30303"
     - "30304"
     - "31315"
   volumes: # docker.sock is mapped as the default CORE_VM_ENDPOINT
     - /var/run/docker.sock:/var/run/docker.sock
-  command: fabric peer
+  command: peer peer
 
diff --git a/hyperledger/docker-compose-with-membersrvc.yml b/hyperledger/docker-compose-with-membersrvc.yml
index 80852891..e78d76ef 100644
--- a/hyperledger/docker-compose-with-membersrvc.yml
+++ b/hyperledger/docker-compose-with-membersrvc.yml
@@ -13,8 +13,12 @@ vp0:
   hostname: vp0
   environment:
     - CORE_PEER_ID=vp0
+    - CORE_SECURITY_ENABLED=true
     - CORE_SECURITY_ENROLLID=test_vp0
     - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
+    - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051
   links:
     - membersrvc
 
@@ -25,9 +29,13 @@ vp1:
   hostname: vp1
   environment:
     - CORE_PEER_ID=vp1
+    - CORE_SECURITY_ENABLED=true
     - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
     - CORE_SECURITY_ENROLLID=test_vp1
     - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
+    - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051
   links:
     - membersrvc
     - vp0
@@ -39,9 +47,13 @@ vp2:
   hostname: vp2
   environment:
     - CORE_PEER_ID=vp2
+    - CORE_SECURITY_ENABLED=true
     - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
     - CORE_SECURITY_ENROLLID=test_vp2
     - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
+    - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051
   links:
     - membersrvc
     - vp0
@@ -57,9 +69,13 @@ vp3:
   hostname: vp3
   environment:
     - CORE_PEER_ID=vp3
+    - CORE_SECURITY_ENABLED=true
     - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
     - CORE_SECURITY_ENROLLID=test_vp3
     - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
+    - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051
   links:
     - membersrvc
     - vp0