diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index b75aef48..3399833c 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -135,8 +135,12 @@ jobs:
       vmImage: ubuntu-20.04
     strategy:
       matrix:
-        Typescript:
+        Typescript-Java:
           CLIENT_LANGUAGE: typescript
+          CHAINCODE_LANGUAGE: java
+        Typescript-Golang:
+          CLIENT_LANGUAGE: typescript
+          CHAINCODE_LANGUAGE: external
     steps:
       - template: templates/install-k8s-deps.yml
       - script: ../ci/scripts/run-k8s-test-network-basic.sh
diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh
index afd9a16b..86093238 100755
--- a/ci/scripts/run-k8s-test-network-basic.sh
+++ b/ci/scripts/run-k8s-test-network-basic.sh
@@ -9,6 +9,7 @@ set -euo pipefail
 # Test matrix parameters
 export CONTAINER_CLI=${CONTAINER_CLI:-docker}
 export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript}
+export CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-java}
 
 # Fabric version and Docker registry source: use the latest stable tag image from JFrog
 export FABRIC_VERSION=${FABRIC_VERSION:-2.4}
@@ -22,8 +23,8 @@ export TEST_NETWORK_KIND_CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind}
 
 # asset-transfer-basic chaincode target
 export TEST_NETWORK_CHAINCODE_NAME=${TEST_NETWORK_CHAINCODE_NAME:-asset-transfer-basic}
-export TEST_NETWORK_CHAINCODE_PATH=${TEST_NETWORK_CHAINCODE_PATH:-$PWD/../asset-transfer-basic/chaincode-java}
-export TEST_NETWORK_CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-fabric-samples/asset-transfer-basic/chaincode-java}
+export TEST_NETWORK_CHAINCODE_PATH=${TEST_NETWORK_CHAINCODE_PATH:-$PWD/../asset-transfer-basic/chaincode-${CHAINCODE_LANGUAGE}}
+export TEST_NETWORK_CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-fabric-samples/asset-transfer-basic/chaincode-${CHAINCODE_LANGUAGE}}
 
 # gateway client application parameters
 export GATEWAY_CLIENT_APPLICATION_PATH=${GATEWAY_CLIENT_APPLICATION_PATH:-../asset-transfer-basic/application-gateway-${CLIENT_LANGUAGE}}
diff --git a/test-network-k8s/kube/org1/org1-cc-template.yaml b/test-network-k8s/kube/org1/org1-cc-template.yaml
index 4a4a701f..05658f52 100644
--- a/test-network-k8s/kube/org1/org1-cc-template.yaml
+++ b/test-network-k8s/kube/org1/org1-cc-template.yaml
@@ -25,8 +25,8 @@ spec:
           env:
             - name: CHAINCODE_SERVER_ADDRESS
               value: 0.0.0.0:9999
-
-            # todo: load with an envFrom and a dynamic config map with the ID.
+            - name: CHAINCODE_ID
+              value: {{CHAINCODE_ID}}
             - name: CORE_CHAINCODE_ID_NAME
               value: {{CHAINCODE_ID}}
           ports: