diff --git a/scripts/shared/lib/clusters_kind b/scripts/shared/lib/clusters_kind
index 953d5da5..48c69032 100755
--- a/scripts/shared/lib/clusters_kind
+++ b/scripts/shared/lib/clusters_kind
@@ -139,6 +139,7 @@ function provider_create_cluster() {
     cat "${RESOURCES_DIR}/${cluster}-config.yaml"
     kind create cluster ${image_flag:+"$image_flag"} --name="${cluster}" --config="${RESOURCES_DIR}/${cluster}-config.yaml"
     kind_fixup_config
+    kind_configure_registry "${cluster}"
 
     [[ "$LOAD_BALANCER" != true ]] || delete_cluster_on_fail deploy_load_balancer
     [[ "$AIR_GAPPED" != true ]] || air_gap_iptables
@@ -232,6 +233,28 @@ function run_local_registry() {
     fi
 }
 
+function kind_configure_registry() {
+    local cluster="$1"
+    REGISTRY_DIR="/etc/containerd/certs.d/localhost:5000"
+    for node in $(kind --name="${cluster}" get nodes); do
+        docker exec "${node}" mkdir -p "${REGISTRY_DIR}"
+        docker exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml" <<EOF
+[host."http://${KIND_REGISTRY}:5000"]
+EOF
+    done
+    kubectl apply -f - <<EOF
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: local-registry-hosting
+  namespace: kube-public
+data:
+  localRegistryHosting.v1: |
+    host: "localhost:5000"
+    help: "https://kind.sigs.k8s.io/docs/user/local-registry/"
+EOF
+}
+
 function provider_failed() {
     if [[ "$(cat /proc/sys/fs/inotify/max_user_instances)" -lt 512 ]]; then
         echo "Your inotify settings are lower than our recommendation."
diff --git a/scripts/shared/lib/deploy_operator b/scripts/shared/lib/deploy_operator
index a411cb96..4caaeaef 100644
--- a/scripts/shared/lib/deploy_operator
+++ b/scripts/shared/lib/deploy_operator
@@ -18,6 +18,7 @@ component_by_image['submariner-operator']=submariner-operator
 component_by_image['submariner-route-agent']=submariner-routeagent
 component_by_image['lighthouse-agent']=submariner-lighthouse-agent
 component_by_image['lighthouse-coredns']=submariner-lighthouse-coredns
+component_by_image['nettest']="submariner-metrics-proxy submariner-nettest"
 
 ### Functions ###
 
@@ -67,9 +68,11 @@ function subctl_install_subm() {
         [[ "$AIR_GAPPED" = true ]] && extra_flags+=(--repository "${SUBM_IMAGE_REPO}" --version "${SUBM_IMAGE_TAG}")
 
         for image in ${PRELOAD_IMAGES}; do
-            local image_key="${component_by_image[$image]}"
-            [[ -n "${image_key}" ]] || continue
-            extra_flags+=(--image-override "${image_key}=${SUBM_IMAGE_REPO}/${image}:${SUBM_IMAGE_TAG}")
+            local image_keys="${component_by_image[$image]}"
+            [[ -n "${image_keys}" ]] || continue
+            for key in ${image_keys}; do
+                extra_flags+=(--image-override "${key}=${SUBM_IMAGE_REPO}/${image}:${SUBM_IMAGE_TAG}")
+            done
         done
     fi
 
diff --git a/scripts/shared/resources/kind-cluster-config.yaml b/scripts/shared/resources/kind-cluster-config.yaml
index 691a6eb1..c80f7f48 100644
--- a/scripts/shared/resources/kind-cluster-config.yaml
+++ b/scripts/shared/resources/kind-cluster-config.yaml
@@ -7,8 +7,8 @@ networking:
   serviceSubnet: ${service_cidr}
 containerdConfigPatches:
   - |-
-    [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"localhost:5000\"]
-      endpoint = [\"http://kind-registry:5000\"]
+    [plugins.\"io.containerd.grpc.v1.cri\".registry]
+      config_path = \"/etc/containerd/certs.d\"
 kubeadmConfigPatches:
   - |
     apiVersion: kubeadm.k8s.io/v1beta2
diff --git a/scripts/shared/resources/kind-cluster-dual-stack-config.yaml b/scripts/shared/resources/kind-cluster-dual-stack-config.yaml
index b70de262..361392fc 100644
--- a/scripts/shared/resources/kind-cluster-dual-stack-config.yaml
+++ b/scripts/shared/resources/kind-cluster-dual-stack-config.yaml
@@ -8,8 +8,8 @@ networking:
   ipFamily: dual
 containerdConfigPatches:
   - |-
-    [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"localhost:5000\"]
-      endpoint = [\"http://kind-registry:5000\"]
+    [plugins.\"io.containerd.grpc.v1.cri\".registry]
+      config_path = \"/etc/containerd/certs.d\"
 kubeadmConfigPatches:
   - |
     apiVersion: kubeadm.k8s.io/v1beta2
diff --git a/scripts/shared/resources/kind-cluster-ipv6-stack-config.yaml b/scripts/shared/resources/kind-cluster-ipv6-stack-config.yaml
index 3cd5e792..45767ef0 100644
--- a/scripts/shared/resources/kind-cluster-ipv6-stack-config.yaml
+++ b/scripts/shared/resources/kind-cluster-ipv6-stack-config.yaml
@@ -8,8 +8,8 @@ networking:
   ipFamily: ipv6
 containerdConfigPatches:
   - |-
-    [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"localhost:5000\"]
-      endpoint = [\"http://kind-registry:5000\"]
+    [plugins.\"io.containerd.grpc.v1.cri\".registry]
+      config_path = \"/etc/containerd/certs.d\"
 kubeadmConfigPatches:
   - |
     apiVersion: kubeadm.k8s.io/v1beta2