diff --git a/test-network-k8s/kube/org0/org0-admin-cli.yaml b/test-network-k8s/kube/org0/org0-admin-cli.yaml
index c7bf84bb..8670e135 100644
--- a/test-network-k8s/kube/org0/org0-admin-cli.yaml
+++ b/test-network-k8s/kube/org0/org0-admin-cli.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-tools:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-tools:kind
           imagePullPolicy: IfNotPresent
           env:
             - name: FABRIC_CFG_PATH
diff --git a/test-network-k8s/kube/org0/org0-ecert-ca.yaml b/test-network-k8s/kube/org0/org0-ecert-ca.yaml
index 40c2edeb..1990e413 100644
--- a/test-network-k8s/kube/org0/org0-ecert-ca.yaml
+++ b/test-network-k8s/kube/org0/org0-ecert-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org0-ecert-ca"
diff --git a/test-network-k8s/kube/org0/org0-orderer1.yaml b/test-network-k8s/kube/org0/org0-orderer1.yaml
index a37b274d..709a0c03 100644
--- a/test-network-k8s/kube/org0/org0-orderer1.yaml
+++ b/test-network-k8s/kube/org0/org0-orderer1.yaml
@@ -43,8 +43,8 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-orderer:{{FABRIC_VERSION}}
-          imagePullPolicy: IfNotPresent
+          image: localhost:5000/fabric-orderer:kind
+          imagePullPolicy: Always
           envFrom:
             - configMapRef:
                 name: org0-orderer1-env
diff --git a/test-network-k8s/kube/org0/org0-orderer2.yaml b/test-network-k8s/kube/org0/org0-orderer2.yaml
index 0070fda9..7ffb7e19 100644
--- a/test-network-k8s/kube/org0/org0-orderer2.yaml
+++ b/test-network-k8s/kube/org0/org0-orderer2.yaml
@@ -43,8 +43,8 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-orderer:{{FABRIC_VERSION}}
-          imagePullPolicy: IfNotPresent
+          image: localhost:5000/fabric-orderer:kind
+          imagePullPolicy: Always
           envFrom:
             - configMapRef:
                 name: org0-orderer2-env
diff --git a/test-network-k8s/kube/org0/org0-orderer3.yaml b/test-network-k8s/kube/org0/org0-orderer3.yaml
index 4db6edbf..20e128a4 100644
--- a/test-network-k8s/kube/org0/org0-orderer3.yaml
+++ b/test-network-k8s/kube/org0/org0-orderer3.yaml
@@ -43,8 +43,8 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-orderer:{{FABRIC_VERSION}}
-          imagePullPolicy: IfNotPresent
+          image: localhost:5000/fabric-orderer:kind
+          imagePullPolicy: Always
           envFrom:
             - configMapRef:
                 name: org0-orderer3-env
diff --git a/test-network-k8s/kube/org0/org0-tls-ca.yaml b/test-network-k8s/kube/org0/org0-tls-ca.yaml
index 179d9c44..bff4628a 100644
--- a/test-network-k8s/kube/org0/org0-tls-ca.yaml
+++ b/test-network-k8s/kube/org0/org0-tls-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org0-tls-ca"
diff --git a/test-network-k8s/kube/org1/org1-admin-cli.yaml b/test-network-k8s/kube/org1/org1-admin-cli.yaml
index 665f3595..200e7520 100644
--- a/test-network-k8s/kube/org1/org1-admin-cli.yaml
+++ b/test-network-k8s/kube/org1/org1-admin-cli.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-tools:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-tools:kind
           imagePullPolicy: IfNotPresent
           env:
             - name: FABRIC_CFG_PATH
diff --git a/test-network-k8s/kube/org1/org1-ecert-ca.yaml b/test-network-k8s/kube/org1/org1-ecert-ca.yaml
index e3da8d11..a23085a3 100644
--- a/test-network-k8s/kube/org1/org1-ecert-ca.yaml
+++ b/test-network-k8s/kube/org1/org1-ecert-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org1-ecert-ca"
diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml
index 0f756a40..27106daf 100644
--- a/test-network-k8s/kube/org1/org1-peer1.yaml
+++ b/test-network-k8s/kube/org1/org1-peer1.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-peer:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-peer:kind
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:
diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml
index 152c950e..faa05958 100644
--- a/test-network-k8s/kube/org1/org1-peer2.yaml
+++ b/test-network-k8s/kube/org1/org1-peer2.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-peer:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-peer:kind
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:
diff --git a/test-network-k8s/kube/org1/org1-tls-ca.yaml b/test-network-k8s/kube/org1/org1-tls-ca.yaml
index afedbe4d..84c9d0b5 100644
--- a/test-network-k8s/kube/org1/org1-tls-ca.yaml
+++ b/test-network-k8s/kube/org1/org1-tls-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org1-tls-ca"
diff --git a/test-network-k8s/kube/org2/org2-admin-cli.yaml b/test-network-k8s/kube/org2/org2-admin-cli.yaml
index be47123a..39818eb8 100644
--- a/test-network-k8s/kube/org2/org2-admin-cli.yaml
+++ b/test-network-k8s/kube/org2/org2-admin-cli.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-tools:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-tools:kind
           imagePullPolicy: IfNotPresent
           env:
             - name: FABRIC_CFG_PATH
diff --git a/test-network-k8s/kube/org2/org2-ecert-ca.yaml b/test-network-k8s/kube/org2/org2-ecert-ca.yaml
index 56c3350f..2c00d3e7 100644
--- a/test-network-k8s/kube/org2/org2-ecert-ca.yaml
+++ b/test-network-k8s/kube/org2/org2-ecert-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org2-ecert-ca"
diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml
index 193dd2cc..13f88dc5 100644
--- a/test-network-k8s/kube/org2/org2-peer1.yaml
+++ b/test-network-k8s/kube/org2/org2-peer1.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-peer:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-peer:kind
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:
diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml
index c0df9b4e..ab471846 100644
--- a/test-network-k8s/kube/org2/org2-peer2.yaml
+++ b/test-network-k8s/kube/org2/org2-peer2.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-peer:{{FABRIC_VERSION}}
+          image: localhost:5000/fabric-peer:kind
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:
diff --git a/test-network-k8s/kube/org2/org2-tls-ca.yaml b/test-network-k8s/kube/org2/org2-tls-ca.yaml
index b28a7aa0..d9be07e4 100644
--- a/test-network-k8s/kube/org2/org2-tls-ca.yaml
+++ b/test-network-k8s/kube/org2/org2-tls-ca.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: main
-          image: hyperledger/fabric-ca:1.5.2
+          image: localhost:5000/fabric-ca:kind
           env:
             - name: FABRIC_CA_SERVER_CA_NAME
               value: "org2-tls-ca"
diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh
index 1784204d..c6e32347 100755
--- a/test-network-k8s/scripts/kind.sh
+++ b/test-network-k8s/scripts/kind.sh
@@ -5,16 +5,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-function pull_docker_images() {
-  push_fn "Pulling docker images for Fabric ${FABRIC_VERSION}"
-
-  docker pull hyperledger/fabric-ca:$FABRIC_CA_VERSION
-  docker pull hyperledger/fabric-orderer:$FABRIC_VERSION
-  docker pull hyperledger/fabric-peer:$FABRIC_VERSION
-  docker pull hyperledger/fabric-tools:$FABRIC_VERSION
-
-  pop_fn
-}
 
 function apply_nginx_ingress() {
   push_fn "Launching Nginx ingress controller"
@@ -80,7 +70,7 @@ function launch_docker_registry() {
   running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)"
   if [ "${running}" != 'true' ]; then
     docker run \
-      -d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" \
+      -d --restart=always --rm -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" \
       registry:2
   fi
 
@@ -123,7 +113,6 @@ function kind_init() {
   # todo: how to pass this through to push_fn ?
   set -o errexit
 
-  pull_docker_images
   kind_create
   apply_nginx_ingress
   launch_docker_registry
diff --git a/test-network-k8s/scripts/test_network.sh b/test-network-k8s/scripts/test_network.sh
index a0a0c87a..8b3abb30 100755
--- a/test-network-k8s/scripts/test_network.sh
+++ b/test-network-k8s/scripts/test_network.sh
@@ -7,6 +7,33 @@
 
 # todo: oof this is rough.
 
+function pull_docker_images() {
+  local registry
+   push_fn "Pulling docker images for Fabric ${FABRIC_VERSION}"
+  
+  if [ "${FABRIC_VERSION}" = "amd64-latest" ]; then
+    FABRIC_CA_VERSION=${FABRIC_VERSION}
+    registry=hyperledger-fabric.jfrog.io
+  else
+    registry=hyperledger
+  fi
+
+  for image in peer orderer tools; do
+      local fullname=$registry/fabric-${image}:$FABRIC_VERSION
+      docker pull ${fullname}
+      docker tag ${fullname} "localhost:5000/fabric-${image}:kind"
+      docker push "localhost:5000/fabric-${image}:kind"
+  done
+
+  local cafullname=$registry/fabric-ca:$FABRIC_CA_VERSION
+  docker pull ${cafullname}
+  docker tag ${cafullname} "localhost:5000/fabric-ca:kind"
+  docker push "localhost:5000/fabric-ca:kind"
+
+
+  pop_fn
+
+}
 
 function launch() {
   local yaml=$1
@@ -205,6 +232,9 @@ function create_local_MSP() {
 
 function network_up() {
 
+  # get the fabric docker images pushed to the local repository
+  pull_docker_images
+
   # Kube config
   init_namespace
   init_storage_volumes