diff --git a/docs/docker-compose-channel.yml b/docs/docker-compose-channel.yml
index 316ffa585d1..9ec446c304d 100644
--- a/docs/docker-compose-channel.yml
+++ b/docs/docker-compose-channel.yml
@@ -36,6 +36,7 @@ services:
       - CORE_PEER_PROFILE_ENABLED=true
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:5005
       - CORE_PEER_GOSSIP_ORGLEADER=true
+      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     ports:
       - 7051:7051
@@ -64,6 +65,7 @@ services:
       - CORE_PEER_ENDORSER_ENABLED=true
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:5005
       - CORE_PEER_ADDRESS=peer0:7051
+      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: /bin/sh
     links:
diff --git a/peer/core.yaml b/peer/core.yaml
index d77bf695d64..3cf883057a4 100644
--- a/peer/core.yaml
+++ b/peer/core.yaml
@@ -149,7 +149,7 @@ peer:
     fileSystemPath: /var/hyperledger/production
 
     # Path on the file system where peer will find MSP local configurations
-    mspConfigPath: /etc/hyperledger/fabric/msp/sampleconfig
+    mspConfigPath: msp/sampleconfig
 
     # Used with Go profiling tools only in none production environment. In
     # production, it should be disabled (eg enabled: false)
diff --git a/unit-test/docker-compose.yml b/unit-test/docker-compose.yml
index c61fd151699..1283c708f7c 100644
--- a/unit-test/docker-compose.yml
+++ b/unit-test/docker-compose.yml
@@ -5,6 +5,7 @@ vp:
     - 7051
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
+    - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
   volumes:
     - /var/run/docker.sock:/var/run/docker.sock