diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
index 95c2a9eadde..18e7483632e 100644
--- a/core/chaincode/chaincodetest.yaml
+++ b/core/chaincode/chaincodetest.yaml
@@ -354,17 +354,16 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
         # This is the basis for the CAR Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            FROM hyperledger/fabric-baseimage
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
 
     # timeout in millisecs for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests
diff --git a/core/ledger/genesis/genesis_test.yaml b/core/ledger/genesis/genesis_test.yaml
index e87623e6bda..b78bbcc77fd 100644
--- a/core/ledger/genesis/genesis_test.yaml
+++ b/core/ledger/genesis/genesis_test.yaml
@@ -178,9 +178,9 @@ chaincode:
 
         # This is the basis for the Golang Dockerfile.  Additional commands will be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+           FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+           COPY src $GOPATH/src
+           WORKDIR $GOPATH
 
     #timeout for starting up a container and waiting for Register to come through
     startuptimeout: 20000
diff --git a/core/rest/rest_test.yaml b/core/rest/rest_test.yaml
index 8393e7332ff..6746cc73c74 100644
--- a/core/rest/rest_test.yaml
+++ b/core/rest/rest_test.yaml
@@ -296,17 +296,16 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
         # This is the basis for the CAR Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            FROM hyperledger/fabric-ccenv
+            FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
 
     # timeout in millisecs for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests
diff --git a/examples/chaincode/go/utxo/Dockerfile b/examples/chaincode/go/utxo/Dockerfile
index 927b746931c..807632d9c30 100644
--- a/examples/chaincode/go/utxo/Dockerfile
+++ b/examples/chaincode/go/utxo/Dockerfile
@@ -1,4 +1,5 @@
-from hyperledger/fabric-baseimage
+# FIXME: someone from the UTXO team will need to verify or rework this
+FROM ubuntu:latest
 
 RUN apt-get update && apt-get install pkg-config autoconf libtool -y
 RUN cd /tmp && git clone https://github.com/bitcoin/secp256k1.git && cd secp256k1/
diff --git a/membersrvc/Dockerfile b/membersrvc/Dockerfile
deleted file mode 100644
index f19aab67568..00000000000
--- a/membersrvc/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-from hyperledger/fabric-baseimage:latest
-# Copy GOPATH src and install Peer
-RUN mkdir -p /var/hyperledger/db
-WORKDIR $GOPATH/src/github.com/hyperledger/fabric/
-COPY . .
-WORKDIR membersrvc
-RUN pwd
-RUN CGO_CFLAGS=" " CGO_LDFLAGS="-lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy" go install && cp $GOPATH/src/github.com/hyperledger/fabric/membersrvc/membersrvc.yaml $GOPATH/bin
-# RUN CGO_CFLAGS=" " CGO_LDFLAGS="-lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy" go install
diff --git a/membersrvc/ca/ca_test.yaml b/membersrvc/ca/ca_test.yaml
index 2dcc8bb2637..3b3e68a7587 100644
--- a/membersrvc/ca/ca_test.yaml
+++ b/membersrvc/ca/ca_test.yaml
@@ -240,9 +240,9 @@ chaincode:
 
         # This is the basis for the Golang Dockerfile.  Additional commands will be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     #timeout in millisecs for starting up a container and waiting for Register to come through. 1sec should be plenty for chaincode unit tests
     startuptimeout: 1000
diff --git a/peer/core.yaml b/peer/core.yaml
index 034fd04f9b9..cfb071626dd 100644
--- a/peer/core.yaml
+++ b/peer/core.yaml
@@ -282,10 +282,9 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
@@ -416,7 +415,7 @@ security:
       enabled: false
 
     # TCerts pool configuration.  Multi-thread pool can also be configured
-    # by multichannel option switching concurrency in communication with TCA. 
+    # by multichannel option switching concurrency in communication with TCA.
     multithreading:
       enabled: false
       multichannel: false