diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/config/core.yaml b/full-stack-asset-transfer-guide/infrastructure/sample-network/config/core.yaml
index fa5eeeb315..c31b54731a 100644
--- a/full-stack-asset-transfer-guide/infrastructure/sample-network/config/core.yaml
+++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/config/core.yaml
@@ -560,15 +560,15 @@ chaincode:
         dynamicLink: false
 
     java:
-        # This is an image based on java:openjdk-8 with addition compiler
+        # This is an image based on eclipse temurin with addition compiler
         # 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:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-javaenv:2.5
 
     node:
         # This is an image based on node:$(NODE_VER)-alpine
-        runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-nodeenv:2.5
 
     # List of directories to treat as external builders and launchers for
     # chaincode. The external builder detection processing will iterate over the
diff --git a/test-network-k8s/config/org1/core.yaml b/test-network-k8s/config/org1/core.yaml
index 9643adbd83..30bcb76347 100644
--- a/test-network-k8s/config/org1/core.yaml
+++ b/test-network-k8s/config/org1/core.yaml
@@ -544,15 +544,15 @@ chaincode:
         dynamicLink: false
 
     java:
-        # This is an image based on java:openjdk-8 with addition compiler
+        # This is an image based on eclipse temurin with addition compiler
         # 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:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-javaenv:2.5
 
     node:
         # This is an image based on node:$(NODE_VER)-alpine
-        runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-nodeenv:2.5
 
     # List of directories to treat as external builders and launchers for
     # chaincode. The external builder detection processing will iterate over the
diff --git a/test-network-k8s/config/org2/core.yaml b/test-network-k8s/config/org2/core.yaml
index e4168a1238..e42561096e 100644
--- a/test-network-k8s/config/org2/core.yaml
+++ b/test-network-k8s/config/org2/core.yaml
@@ -544,15 +544,15 @@ chaincode:
         dynamicLink: false
 
     java:
-        # This is an image based on java:openjdk-8 with addition compiler
+        # This is an image based on eclipse temurin with addition compiler
         # 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:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-javaenv:2.5
 
     node:
         # This is an image based on node:$(NODE_VER)-alpine
-        runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
+        runtime: $(DOCKER_NS)/fabric-nodeenv:2.5
 
     # List of directories to treat as external builders and launchers for
     # chaincode. The external builder detection processing will iterate over the