diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
index b9be2937535..cc151dd34b3 100644
--- a/core/chaincode/chaincodetest.yaml
+++ b/core/chaincode/chaincodetest.yaml
@@ -315,7 +315,12 @@ chaincode:
         # tools added for java shim layer packaging.
         # This image is packed with shim layer libraries that are necessary
         # for Java chaincode runtime.
-        runtime:  $(DOCKER_NS)/fabric-javaenv:$(ARCH)-$(PROJECT_VERSION)
+        runtime:  $(DOCKER_NS)/fabric-javaenv:latest
+
+    node:
+        # need node.js engine at runtime, currently available in baseimage
+        # but not in baseos
+        runtime: $(BASE_DOCKER_NS)/fabric-baseimage:latest
 
     # 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/sampleconfig/core.yaml b/sampleconfig/core.yaml
index 25ecd7b16e0..885a666c455 100644
--- a/sampleconfig/core.yaml
+++ b/sampleconfig/core.yaml
@@ -505,12 +505,12 @@ chaincode:
         # tools added for java shim layer packaging.
         # This image is packed with shim layer libraries that are necessary
         # for Java chaincode runtime.
-        runtime: $(DOCKER_NS)/fabric-javaenv:$(ARCH)-$(PROJECT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-javaenv:latest
 
     node:
         # need node.js engine at runtime, currently available in baseimage
         # but not in baseos
-        runtime: $(BASE_DOCKER_NS)/fabric-baseimage:$(ARCH)-$(BASE_VERSION)
+        runtime: $(BASE_DOCKER_NS)/fabric-baseimage:latest
 
     # Timeout duration for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests