diff --git a/extensions/base/suite.go b/extensions/base/suite.go
index 5631196eb53..95c500948a9 100644
--- a/extensions/base/suite.go
+++ b/extensions/base/suite.go
@@ -52,7 +52,7 @@ func (s *Suite) TearDownSuite() {
 }
 
 const (
-	sha = "219d42c3d6d33d0eaacd00e566ca5ab796ee7661"
+	sha = "d60db58acfbb87c6b02ea2bac71f557bdd029564"
 )
 
 // SetupSuite runs all extensions
diff --git a/suites/basic/suite.gen.go b/suites/basic/suite.gen.go
index e4e51d5d087..8566bb3af2d 100755
--- a/suites/basic/suite.gen.go
+++ b/suites/basic/suite.gen.go
@@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 }
 func (s *Suite) TestKernel2Kernel() {
@@ -37,7 +37,7 @@ func (s *Suite) TestKernel2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -51,7 +51,7 @@ func (s *Suite) TestKernel2Memif() {
 		r.Run(`kubectl delete ns ns-kernel2memif`)
 	})
 	r.Run(`kubectl create ns ns-kernel2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -65,7 +65,7 @@ func (s *Suite) TestKernel2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2vxlan2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2vxlan2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2vxlan2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -79,7 +79,7 @@ func (s *Suite) TestKernel2Vxlan2Memif() {
 		r.Run(`kubectl delete ns ns-kernel2vxlan2memif`)
 	})
 	r.Run(`kubectl create ns ns-kernel2vxlan2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2vxlan2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -93,7 +93,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -107,7 +107,7 @@ func (s *Suite) TestKernel2Wireguard2Memif() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2memif`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2wireguard2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -121,7 +121,7 @@ func (s *Suite) TestMemif2Kernel() {
 		r.Run(`kubectl delete ns ns-memif2kernel`)
 	})
 	r.Run(`kubectl create ns ns-memif2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -135,7 +135,7 @@ func (s *Suite) TestMemif2Memif() {
 		r.Run(`kubectl delete ns ns-memif2memif`)
 	})
 	r.Run(`kubectl create ns ns-memif2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -149,7 +149,7 @@ func (s *Suite) TestMemif2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ns-memif2vxlan2kernel`)
 	})
 	r.Run(`kubectl create ns ns-memif2vxlan2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2vxlan2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2vxlan2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -163,7 +163,7 @@ func (s *Suite) TestMemif2Vxlan2Memif() {
 		r.Run(`kubectl delete ns ns-memif2vxlan2memif`)
 	})
 	r.Run(`kubectl create ns ns-memif2vxlan2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2vxlan2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2vxlan2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2vxlan2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -177,7 +177,7 @@ func (s *Suite) TestMemif2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ns-memif2wireguard2kernel`)
 	})
 	r.Run(`kubectl create ns ns-memif2wireguard2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2wireguard2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -191,7 +191,7 @@ func (s *Suite) TestMemif2Wireguard2Memif() {
 		r.Run(`kubectl delete ns ns-memif2wireguard2memif`)
 	})
 	r.Run(`kubectl create ns ns-memif2wireguard2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2wireguard2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
diff --git a/suites/features/suite.gen.go b/suites/features/suite.gen.go
index 6af145ee500..cdcc67b40cc 100755
--- a/suites/features/suite.gen.go
+++ b/suites/features/suite.gen.go
@@ -29,10 +29,10 @@ func (s *Suite) TestAnnotated_namespace() {
 	s.T().Cleanup(func() {
 		r.Run(`kubectl delete ns ns-annotated-namespace`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/annotated-namespace?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/annotated-namespace?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-annotated-namespace`)
 	r.Run(`kubectl annotate ns ns-annotated-namespace networkservicemesh.io=kernel://annotated-namespace/nsm-1`)
-	r.Run(`kubectl apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/features/annotated-namespace/client.yaml`)
+	r.Run(`kubectl apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/features/annotated-namespace/client.yaml`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-annotated-namespace`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-annotated-namespace --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-annotated-namespace --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -45,7 +45,7 @@ func (s *Suite) TestDns() {
 		r.Run(`kubectl delete ns ns-dns`)
 	})
 	r.Run(`kubectl create ns ns-dns`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dns?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dns?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod dnsutils -n ns-dns`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nse-kernel -n ns-dns`)
 	r.Run(`NSC=$(kubectl get pods -l app=dnsutils -n ns-dns --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -60,7 +60,7 @@ func (s *Suite) TestKernel2Kernel_dual_stack() {
 		r.Run(`kubectl delete ns ns-kernel2kernel-dual-stack`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel-dual-stack`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Kernel_dual_stack?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Kernel_dual_stack?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel-dual-stack`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-dual-stack`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel-dual-stack --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -76,7 +76,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel_dual_stack() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-dual-stack`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2kernel-dual-stack`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Wireguard2Kernel_dual_stack?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Wireguard2Kernel_dual_stack?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel-dual-stack`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel-dual-stack`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel-dual-stack --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -93,7 +93,7 @@ func (s *Suite) TestExclude_prefixes() {
 	})
 	r.Run(`kubectl create ns ns-exclude-prefixes`)
 	r.Run(`kubectl apply -f exclude-prefixes-config-map.yaml`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-exclude-prefixes`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-exclude-prefixes`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-exclude-prefixes --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -107,7 +107,7 @@ func (s *Suite) TestExclude_prefixes_client() {
 		r.Run(`kubectl delete ns ns-exclude-prefixes-client`)
 	})
 	r.Run(`kubectl create ns ns-exclude-prefixes-client`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes-client?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes-client?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-exclude-prefixes-client`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-1 -n ns-exclude-prefixes-client`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-2 -n ns-exclude-prefixes-client`)
@@ -125,7 +125,7 @@ func (s *Suite) TestKernel2Kernel_ipv6() {
 		r.Run(`kubectl delete ns ns-kernel2kernel-ipv6`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel-ipv6`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Kernel_ipv6?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Kernel_ipv6?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel-ipv6`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-ipv6`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -139,7 +139,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel_ipv6() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-ipv6`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2kernel-ipv6`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Kernel_ipv6?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Kernel_ipv6?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel-ipv6`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel-ipv6`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -153,7 +153,7 @@ func (s *Suite) TestKernel2Wireguard2Memif_ipv6() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2memif-ipv6`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2memif-ipv6`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Memif_ipv6?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Memif_ipv6?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2memif-ipv6`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2wireguard2memif-ipv6`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2memif-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -181,7 +181,7 @@ func (s *Suite) TestMemif2Wireguard2Kernel_ipv6() {
 		r.Run(`kubectl delete ns ns-memif2wireguard2kernel-ipv6`)
 	})
 	r.Run(`kubectl create ns ns-memif2wireguard2kernel-ipv6`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Kernel_ipv6?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Kernel_ipv6?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2kernel-ipv6`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2wireguard2kernel-ipv6`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -195,7 +195,7 @@ func (s *Suite) TestMemif2Wireguard2Memif_ipv6() {
 		r.Run(`kubectl delete ns ns-memif2wireguard2memif-ipv6`)
 	})
 	r.Run(`kubectl create ns ns-memif2wireguard2memif-ipv6`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Memif_ipv6?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Memif_ipv6?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2memif-ipv6`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2wireguard2memif-ipv6`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2memif-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -209,7 +209,7 @@ func (s *Suite) TestMutually_aware_nses() {
 		r.Run(`kubectl delete ns ns-mutually-aware-nses`)
 	})
 	r.Run(`kubectl create ns ns-mutually-aware-nses`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/mutually-aware-nses?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/mutually-aware-nses?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-mutually-aware-nses`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-1 -n ns-mutually-aware-nses`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-2 -n ns-mutually-aware-nses`)
@@ -224,7 +224,7 @@ func (s *Suite) TestNse_composition() {
 		r.Run(`kubectl delete ns ns-nse-composition`)
 	})
 	r.Run(`kubectl create ns ns-nse-composition`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/nse-composition?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/nse-composition?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-nse-composition`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-nse-composition`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-nse-composition --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -240,7 +240,7 @@ func (s *Suite) TestOpa() {
 		r.Run(`kubectl delete ns ns-opa`)
 	})
 	r.Run(`kubectl create ns ns-opa`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/opa?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/opa?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-opa`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-opa`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-opa --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -253,7 +253,7 @@ func (s *Suite) TestPolicy_based_routing() {
 		r.Run(`kubectl delete ns ns-policy-based-routing`)
 	})
 	r.Run(`kubectl create ns ns-policy-based-routing`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/policy-based-routing?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/policy-based-routing?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nettools -n ns-policy-based-routing`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-policy-based-routing`)
 	r.Run(`NSC=$(kubectl get pods -l app=nettools -n ns-policy-based-routing --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -274,7 +274,7 @@ func (s *Suite) TestScale_from_zero() {
 	})
 	r.Run(`kubectl create ns ns-scale-from-zero`)
 	r.Run(`NODES=($(kubectl get nodes -o go-template='{{range .items}}{{ if not .spec.taints }}{{ .metadata.name }} {{end}}{{end}}'))` + "\n" + `NSC_NODE=${NODES[0]}` + "\n" + `SUPPLIER_NODE=${NODES[1]}` + "\n" + `if [ "$SUPPLIER_NODE" == "" ]; then SUPPLIER_NODE=$NSC_NODE; echo "Only 1 node found, testing that pod is created on the same node is useless"; fi`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/scale-from-zero?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/scale-from-zero?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-supplier-k8s`)
 	r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nsc-kernel`)
 	r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-icmp-responder`)
@@ -292,7 +292,7 @@ func (s *Suite) TestSelect_forwarder() {
 		r.Run(`kubectl delete ns ns-select-forwarder`)
 	})
 	r.Run(`kubectl create ns ns-select-forwarder`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/select-forwarder?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/select-forwarder?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-select-forwarder`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-select-forwarder`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-select-forwarder --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -307,7 +307,7 @@ func (s *Suite) TestVl3_basic() {
 		r.Run(`kubectl delete ns ns-vl3`)
 	})
 	r.Run(`kubectl create ns ns-vl3`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-basic?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-basic?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nscs=$(kubectl  get pods -l app=nsc-kernel -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3) ` + "\n" + `[[ ! -z $nscs ]]`)
 	r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + `    ipAddr=$(kubectl exec -n ns-vl3 $nsc -- ifconfig nsm-1)` + "\n" + `    ipAddr=$(echo $ipAddr | grep -Eo 'inet addr:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'| cut -c 11-)` + "\n" + `    for pinger in $nscs` + "\n" + `    do` + "\n" + `        echo $pinger pings $ipAddr` + "\n" + `        kubectl exec $pinger -n ns-vl3 -- ping -c4 $ipAddr` + "\n" + `    done` + "\n" + `done`)
 	r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + `    echo $nsc pings nses` + "\n" + `    kubectl exec -n ns-vl3 $nsc -- ping 169.254.0.0 -c4` + "\n" + `    kubectl exec -n ns-vl3 $nsc -- ping 169.254.1.0 -c4` + "\n" + `done`)
@@ -317,7 +317,7 @@ func (s *Suite) TestVl3_dns() {
 	s.T().Cleanup(func() {
 		r.Run(`kubectl delete ns ns-vl3-dns`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-dns?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-dns?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nscs=$(kubectl  get pods -l app=alpine -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3-dns) ` + "\n" + `[[ ! -z $nscs ]]`)
 	r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + `    for pinger in $nscs` + "\n" + `    do` + "\n" + `        kubectl exec $pinger -n ns-vl3-dns -- ping -c4 $nsc.vl3-dns` + "\n" + `    done` + "\n" + `done`)
 }
@@ -327,7 +327,7 @@ func (s *Suite) TestVl3_scale_from_zero() {
 		r.Run(`kubectl delete ns ns-vl3-scale-from-zero`)
 	})
 	r.Run(`kubectl create ns ns-vl3-scale-from-zero`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-scale-from-zero?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-scale-from-zero?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-supplier-k8s`)
 	r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nsc-kernel`)
 	r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-vl3-vpp`)
@@ -341,7 +341,7 @@ func (s *Suite) TestWebhook() {
 		r.Run(`kubectl delete ns ns-webhook`)
 	})
 	r.Run(`kubectl create ns ns-webhook`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nse-kernel -n ns-webhook`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nettools -n ns-webhook`)
 	r.Run(`NSC=$(kubectl get pods -l app=nettools -n ns-webhook --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
diff --git a/suites/floating_interdomain/spire/suite.gen.go b/suites/floating_interdomain/spire/suite.gen.go
index 9bbf89915eb..8829e76b9fa 100755
--- a/suites/floating_interdomain/spire/suite.gen.go
+++ b/suites/floating_interdomain/spire/suite.gen.go
@@ -29,15 +29,15 @@ func (s *Suite) SetupSuite() {
 	r.Run(`[[ ! -z $KUBECONFIG2 ]]`)
 	r.Run(`[[ ! -z $KUBECONFIG3 ]]`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG3`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster3?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster3?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1 && bundle1=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `export KUBECONFIG=$KUBECONFIG2 && bundle2=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `export KUBECONFIG=$KUBECONFIG3 && bundle3=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)`)
diff --git a/suites/floating_interdomain/suite.gen.go b/suites/floating_interdomain/suite.gen.go
index be1253143ce..62807255635 100755
--- a/suites/floating_interdomain/suite.gen.go
+++ b/suites/floating_interdomain/suite.gen.go
@@ -55,14 +55,14 @@ func (s *Suite) TestFloatingKernel2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ${NAMESPACE2}`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nse.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      annotations:` + "\n" + `        registration-name: icmp-server@my.cluster3` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nse` + "\n" + `          env:` + "\n" + `          - name: NSM_NAME` + "\n" + `            valueFrom:` + "\n" + `              fieldRef:` + "\n" + `                fieldPath: metadata.annotations['registration-name']` + "\n" + `          - name: NSM_CIDR_PREFIX` + "\n" + `            value: 172.16.1.2/31` + "\n" + `          - name: NSM_SERVICE_NAMES` + "\n" + `            value: icmp-responder@my.cluster3` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE1} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `[[ ! -z $NSE ]]`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nsc.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nsc-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nsc` + "\n" + `          env:` + "\n" + `            - name: NSM_NETWORK_SERVICES` + "\n" + `              value: kernel://icmp-responder@my.cluster3/nsm-1` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nsc-kernel -n ${NAMESPACE2}`)
@@ -81,13 +81,13 @@ func (s *Suite) TestFloatingKernel2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ${NAMESPACE2}`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
+	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
 	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `resources:` + "\n" + `- nse.yaml` + "\n" + `` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE1} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `[[ ! -z $NSE ]]`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nsc.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nsc-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nsc` + "\n" + `          env:` + "\n" + `            - name: NSM_NETWORK_SERVICES` + "\n" + `              value: kernel://my-networkservice-ip@my.cluster3/nsm-1` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nsc-kernel -n ${NAMESPACE2}`)
@@ -100,18 +100,18 @@ func (s *Suite) TestFloatingKernel2Wireguard2Kernel() {
 func (s *Suite) TestFloatingVl3() {
 	r := s.Runner("../deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3")
 	s.T().Cleanup(func() {
-		r.Run(`export KUBECONFIG=$KUBECONFIG3 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster3?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-		r.Run(`export KUBECONFIG=$KUBECONFIG2 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-		r.Run(`export KUBECONFIG=$KUBECONFIG1 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG3 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster3?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG2 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG1 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG3`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster3?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster3?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `resources:` + "\n" + `-  https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-vl3-nse.yaml` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `resources:` + "\n" + `-  https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-vl3-nse.yaml` + "\n" + `EOF`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `resources:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-vl3-nse.yaml` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `resources:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-vl3-nse.yaml` + "\n" + `EOF`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nsc2=$(kubectl get pods -l app=nsc-kernel -n ns-vl3-interdomain --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
 	r.Run(`nsc1=$(kubectl get pods -l app=nsc-kernel -n ns-vl3-interdomain --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -124,16 +124,16 @@ func (s *Suite) TestFloatingVl3() {
 func (s *Suite) TestFloatingVl3_scale_from_zero() {
 	r := s.Runner("../deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero")
 	s.T().Cleanup(func() {
-		r.Run(`export KUBECONFIG=$KUBECONFIG3 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster3?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-		r.Run(`export KUBECONFIG=$KUBECONFIG2 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-		r.Run(`export KUBECONFIG=$KUBECONFIG1 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG3 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster3?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG2 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+		r.Run(`export KUBECONFIG=$KUBECONFIG1 && kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG3`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster3?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster3?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/usecases/FloatingVl3-scale-from-zero/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nsc2=$(kubectl get pods -l app=nsc-kernel -n ns-vl3-interdomain --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
 	r.Run(`nsc1=$(kubectl get pods -l app=nsc-kernel -n ns-vl3-interdomain --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -152,14 +152,14 @@ func (s *Suite) TestKernel2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ${NAMESPACE1}`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nse.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nse` + "\n" + `          env:` + "\n" + `            - name: NSM_CIDR_PREFIX` + "\n" + `              value: 172.16.1.2/31` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE1} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `[[ ! -z $NSE ]]`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nsc.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nsc-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nsc` + "\n" + `          env:` + "\n" + `            - name: NSM_NETWORK_SERVICES` + "\n" + `              value: kernel://icmp-responder@my.cluster2/nsm-1` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nsc-kernel -n ${NAMESPACE2}`)
@@ -178,14 +178,14 @@ func (s *Suite) TestKernel2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ${NAMESPACE1}`)
 	})
 	r.Run(`export KUBECONFIG=$KUBECONFIG2`)
-	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE1}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nse.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nse` + "\n" + `          env:` + "\n" + `            - name: NSM_CIDR_PREFIX` + "\n" + `              value: 172.16.1.2/31` + "\n" + `            - name: NSM_PAYLOAD` + "\n" + `              value: IP` + "\n" + `            - name: NSM_SERVICE_NAMES` + "\n" + `              value: my-networkservice-ip` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE1} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `[[ ! -z $NSE ]]`)
 	r.Run(`export KUBECONFIG=$KUBECONFIG1`)
-	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
-	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
+	r.Run(`NAMESPACE2=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE2=${NAMESPACE2:10}`)
+	r.Run(`cat > kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ${NAMESPACE2}` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nsc.yaml` + "\n" + `EOF`)
 	r.Run(`cat > patch-nsc.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nsc-kernel` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: nsc` + "\n" + `          env:` + "\n" + `            - name: NSM_NETWORK_SERVICES` + "\n" + `              value: kernel://my-networkservice-ip@my.cluster2/nsm-1` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k .`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nsc-kernel -n ${NAMESPACE2}`)
diff --git a/suites/heal/suite.gen.go b/suites/heal/suite.gen.go
index 0af54578d14..8d5088b5221 100755
--- a/suites/heal/suite.gen.go
+++ b/suites/heal/suite.gen.go
@@ -30,7 +30,7 @@ func (s *Suite) TestDataplane_interrupt() {
 		r.Run(`kubectl delete ns ns-dataplane-interrupt`)
 	})
 	r.Run(`kubectl create ns ns-dataplane-interrupt`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/dataplane-interrupt?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/dataplane-interrupt?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-dataplane-interrupt`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-dataplane-interrupt`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-dataplane-interrupt --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -49,7 +49,7 @@ func (s *Suite) TestLocal_forwarder_death() {
 		r.Run(`kubectl delete ns ns-local-forwarder-death`)
 	})
 	r.Run(`kubectl create ns ns-local-forwarder-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-forwarder-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-forwarder-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-local-forwarder-death`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-local-forwarder-death`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-local-forwarder-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -69,7 +69,7 @@ func (s *Suite) TestLocal_forwarder_remote_forwarder() {
 		r.Run(`kubectl delete ns ns-local-forwarder-remote-forwarder`)
 	})
 	r.Run(`kubectl create ns ns-local-forwarder-remote-forwarder`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-forwarder-remote-forwarder?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-forwarder-remote-forwarder?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-local-forwarder-remote-forwarder`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-local-forwarder-remote-forwarder`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-local-forwarder-remote-forwarder --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -114,7 +114,7 @@ func (s *Suite) TestLocal_nsm_system_restart() {
 		r.Run(`kubectl delete ns ns-local-nsm-system-restart`)
 	})
 	r.Run(`kubectl create ns ns-local-nsm-system-restart`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsm-system-restart?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsm-system-restart?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-local-nsm-system-restart`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-local-nsm-system-restart`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-local-nsm-system-restart --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -123,7 +123,7 @@ func (s *Suite) TestLocal_nsm_system_restart() {
 	r.Run(`kubectl exec ${NSE} -n ns-local-nsm-system-restart -- ping -c 4 172.16.1.101`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl exec ${NSC} -n ns-local-nsm-system-restart -- ping -c 4 172.16.1.100`)
 	r.Run(`kubectl exec ${NSE} -n ns-local-nsm-system-restart -- ping -c 4 172.16.1.101`)
 }
@@ -133,7 +133,7 @@ func (s *Suite) TestLocal_nsmgr_local_forwarder_memif() {
 		r.Run(`kubectl delete ns ns-local-nsmgr-local-forwarder-memif`)
 	})
 	r.Run(`kubectl create ns ns-local-nsmgr-local-forwarder-memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-forwarder-memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-forwarder-memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-local-nsmgr-local-forwarder-memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-local-nsmgr-local-forwarder-memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-local-nsmgr-local-forwarder-memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -156,7 +156,7 @@ func (s *Suite) TestLocal_nsmgr_local_nse_memif() {
 		r.Run(`kubectl delete ns ns-local-nsmgr-local-nse-memif`)
 	})
 	r.Run(`kubectl create ns ns-local-nsmgr-local-nse-memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-nse-memif/nse-before-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-nse-memif/nse-before-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-local-nsmgr-local-nse-memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-local-nsmgr-local-nse-memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-local-nsmgr-local-nse-memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -167,7 +167,7 @@ func (s *Suite) TestLocal_nsmgr_local_nse_memif() {
 	r.Run(`NSC_NODE=$(kubectl get pods -l app=nsc-memif -n ns-local-nsmgr-local-nse-memif --template '{{range .items}}{{.spec.nodeName}}{{"\n"}}{{end}}')`)
 	r.Run(`NSMGR=$(kubectl get pods -l app=nsmgr --field-selector spec.nodeName==${NSC_NODE} -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl delete pod ${NSMGR} -n nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-nse-memif/nse-after-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-local-nse-memif/nse-after-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsmgr --field-selector spec.nodeName==${NSC_NODE} -n nsm-system`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -l version=new -n ns-local-nsmgr-local-nse-memif`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l app=nse-memif -l version=new -n ns-local-nsmgr-local-nse-memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -180,7 +180,7 @@ func (s *Suite) TestLocal_nsmgr_remote_nsmgr() {
 		r.Run(`kubectl delete ns ns-local-nsmgr-remote-nsmgr`)
 	})
 	r.Run(`kubectl create ns ns-local-nsmgr-remote-nsmgr`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-remote-nsmgr?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-remote-nsmgr?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-local-nsmgr-remote-nsmgr`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-local-nsmgr-remote-nsmgr`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-local-nsmgr-remote-nsmgr --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -203,7 +203,7 @@ func (s *Suite) TestLocal_nsmgr_restart() {
 		r.Run(`kubectl delete ns ns-local-nsmgr-restart`)
 	})
 	r.Run(`kubectl create ns ns-local-nsmgr-restart`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-restart?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/local-nsmgr-restart?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-local-nsmgr-restart`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-local-nsmgr-restart`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-local-nsmgr-restart --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -223,7 +223,7 @@ func (s *Suite) TestRegistry_local_endpoint() {
 		r.Run(`kubectl delete ns ns-registry-local-endpoint`)
 	})
 	r.Run(`kubectl create ns ns-registry-local-endpoint`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-local-endpoint/nse-first?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-local-endpoint/nse-first?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-registry-local-endpoint`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-registry-local-endpoint`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-registry-local-endpoint --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -232,7 +232,7 @@ func (s *Suite) TestRegistry_local_endpoint() {
 	r.Run(`kubectl exec ${NSE} -n ns-registry-local-endpoint -- ping -c 4 172.16.1.101`)
 	r.Run(`REGISTRY=$(kubectl get pods -l app=registry -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl delete pod ${REGISTRY} -n nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-local-endpoint/nse-second?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-local-endpoint/nse-second?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=registry -n nsm-system`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -l version=new -n ns-registry-local-endpoint`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l app=nse-kernel -l version=new -n ns-registry-local-endpoint --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -245,7 +245,7 @@ func (s *Suite) TestRegistry_remote_forwarder() {
 		r.Run(`kubectl delete ns ns-registry-remote-forwarder`)
 	})
 	r.Run(`kubectl create ns ns-registry-remote-forwarder`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-remote-forwarder?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-remote-forwarder?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-registry-remote-forwarder`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-registry-remote-forwarder`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-registry-remote-forwarder --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -268,7 +268,7 @@ func (s *Suite) TestRegistry_remote_nsmgr() {
 		r.Run(`kubectl delete ns ns-registry-remote-nsmgr`)
 	})
 	r.Run(`kubectl create ns ns-registry-remote-nsmgr`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-remote-nsmgr?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-remote-nsmgr?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-registry-remote-nsmgr`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-registry-remote-nsmgr`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-registry-remote-nsmgr --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -291,7 +291,7 @@ func (s *Suite) TestRegistry_restart() {
 		r.Run(`kubectl delete ns ns-registry-restart`)
 	})
 	r.Run(`kubectl create ns ns-registry-restart`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-restart/registry-before-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-restart/registry-before-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-registry-restart`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-registry-restart`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-registry-restart --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -301,7 +301,7 @@ func (s *Suite) TestRegistry_restart() {
 	r.Run(`REGISTRY=$(kubectl get pods -l app=registry -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl delete pod ${REGISTRY} -n nsm-system`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=registry -n nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-restart/registry-after-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/registry-restart/registry-after-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel-new -n ns-registry-restart`)
 	r.Run(`NEW_NSC=$(kubectl get pods -l app=nsc-kernel-new -n ns-registry-restart --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NEW_NSC} -n ns-registry-restart -- ping -c 4 172.16.1.102`)
@@ -313,7 +313,7 @@ func (s *Suite) TestRemote_forwarder_death() {
 		r.Run(`kubectl delete ns ns-remote-forwarder-death`)
 	})
 	r.Run(`kubectl create ns ns-remote-forwarder-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-forwarder-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-forwarder-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-forwarder-death`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-forwarder-death`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-forwarder-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -333,7 +333,7 @@ func (s *Suite) TestRemote_forwarder_death_ip() {
 		r.Run(`kubectl delete ns ns-remote-forwarder-death-ip`)
 	})
 	r.Run(`kubectl create ns ns-remote-forwarder-death-ip`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-forwarder-death-ip?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-forwarder-death-ip?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-forwarder-death-ip`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-forwarder-death-ip`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-forwarder-death-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -353,14 +353,14 @@ func (s *Suite) TestRemote_nse_death() {
 		r.Run(`kubectl delete ns ns-remote-nse-death`)
 	})
 	r.Run(`kubectl create ns ns-remote-nse-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death/nse-before-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death/nse-before-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nse-death`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nse-death`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nse-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-remote-nse-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nse-death -- ping -c 4 172.16.1.100`)
 	r.Run(`kubectl exec ${NSE} -n ns-remote-nse-death -- ping -c 4 172.16.1.101`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death/nse-after-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death/nse-after-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -l version=new -n ns-remote-nse-death`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l app=nse-kernel -l version=new -n ns-remote-nse-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nse-death -- ping -c 4 172.16.1.102`)
@@ -372,14 +372,14 @@ func (s *Suite) TestRemote_nse_death_ip() {
 		r.Run(`kubectl delete ns ns-remote-nse-death-ip`)
 	})
 	r.Run(`kubectl create ns ns-remote-nse-death-ip`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death-ip/nse-before-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death-ip/nse-before-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nse-death-ip`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nse-death-ip`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nse-death-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-remote-nse-death-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nse-death-ip -- ping -c 4 172.16.1.100`)
 	r.Run(`kubectl exec ${NSE} -n ns-remote-nse-death-ip -- ping -c 4 172.16.1.101`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death-ip/nse-after-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nse-death-ip/nse-after-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -l version=new -n ns-remote-nse-death-ip`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l app=nse-kernel -l version=new -n ns-remote-nse-death-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nse-death-ip -- ping -c 4 172.16.1.102`)
@@ -391,7 +391,7 @@ func (s *Suite) TestRemote_nsm_system_restart_memif_ip() {
 		r.Run(`kubectl delete ns ns-remote-nsm-system-restart-memif-ip`)
 	})
 	r.Run(`kubectl create ns ns-remote-nsm-system-restart-memif-ip`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsm-system-restart-memif-ip?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsm-system-restart-memif-ip?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-remote-nsm-system-restart-memif-ip`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-remote-nsm-system-restart-memif-ip`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-remote-nsm-system-restart-memif-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -400,26 +400,26 @@ func (s *Suite) TestRemote_nsm_system_restart_memif_ip() {
 	r.Run(`result=$(kubectl exec "${NSE}" -n "ns-remote-nsm-system-restart-memif-ip" -- vppctl ping 172.16.1.101 repeat 4)` + "\n" + `echo ${result}` + "\n" + `! echo ${result} | grep -E -q "(100% packet loss)|(0 sent)|(no egress interface)"`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`result=$(kubectl exec "${NSC}" -n "ns-remote-nsm-system-restart-memif-ip" -- vppctl ping 172.16.1.100 repeat 4)` + "\n" + `echo ${result}` + "\n" + `! echo ${result} | grep -E -q "(100% packet loss)|(0 sent)|(no egress interface)"`)
 	r.Run(`result=$(kubectl exec "${NSE}" -n "ns-remote-nsm-system-restart-memif-ip" -- vppctl ping 172.16.1.101 repeat 4)` + "\n" + `echo ${result}` + "\n" + `! echo ${result} | grep -E -q "(100% packet loss)|(0 sent)|(no egress interface)"`)
 }
 func (s *Suite) TestRemote_nsmgr_death() {
 	r := s.Runner("../deployments-k8s/examples/heal/remote-nsmgr-death")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/apps/nsmgr?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18 -n nsm-system`)
+		r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/apps/nsmgr?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f -n nsm-system`)
 		r.Run(`kubectl delete ns ns-remote-nsmgr-death`)
 	})
 	r.Run(`kubectl create ns ns-remote-nsmgr-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/remote-nse?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/remote-nse?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nsmgr-death`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nsmgr-death`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nsmgr-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-remote-nsmgr-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nsmgr-death -- ping -c 4 172.16.1.100`)
 	r.Run(`kubectl exec ${NSE} -n ns-remote-nsmgr-death -- ping -c 4 172.16.1.101`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/nsmgr-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/local-nse?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/nsmgr-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-death/local-nse?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l nse-version=local -n ns-remote-nsmgr-death`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l nse-version=local -n ns-remote-nsmgr-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-remote-nsmgr-death -- ping -c 4 172.16.1.102`)
@@ -431,7 +431,7 @@ func (s *Suite) TestRemote_nsmgr_remote_endpoint() {
 		r.Run(`kubectl delete ns ns-remote-nsmgr-remote-endpoint`)
 	})
 	r.Run(`kubectl create ns ns-remote-nsmgr-remote-endpoint`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-before-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nsmgr-remote-endpoint`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nsmgr-remote-endpoint`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nsmgr-remote-endpoint --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -441,7 +441,7 @@ func (s *Suite) TestRemote_nsmgr_remote_endpoint() {
 	r.Run(`NSE_NODE=$(kubectl get pods -l app=nse-kernel -n ns-remote-nsmgr-remote-endpoint --template '{{range .items}}{{.spec.nodeName}}{{"\n"}}{{end}}')`)
 	r.Run(`NSMGR=$(kubectl get pods -l app=nsmgr --field-selector spec.nodeName==${NSE_NODE} -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl delete pod ${NSMGR} -n nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-after-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-remote-endpoint/nsmgr-after-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsmgr --field-selector spec.nodeName==${NSE_NODE} -n nsm-system`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -l version=new -n ns-remote-nsmgr-remote-endpoint`)
 	r.Run(`NEW_NSE=$(kubectl get pods -l app=nse-kernel -l version=new -n ns-remote-nsmgr-remote-endpoint --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -454,7 +454,7 @@ func (s *Suite) TestRemote_nsmgr_restart() {
 		r.Run(`kubectl delete ns ns-remote-nsmgr-restart`)
 	})
 	r.Run(`kubectl create ns ns-remote-nsmgr-restart`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-restart?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-restart?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nsmgr-restart`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nsmgr-restart`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nsmgr-restart --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -474,7 +474,7 @@ func (s *Suite) TestRemote_nsmgr_restart_ip() {
 		r.Run(`kubectl delete ns ns-remote-nsmgr-restart-ip`)
 	})
 	r.Run(`kubectl create ns ns-remote-nsmgr-restart-ip`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-restart-ip?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/remote-nsmgr-restart-ip?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-remote-nsmgr-restart-ip`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-remote-nsmgr-restart-ip`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-remote-nsmgr-restart-ip --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -494,7 +494,7 @@ func (s *Suite) TestVl3_nscs_death() {
 		r.Run(`kubectl delete ns ns-vl3-nscs-death`)
 	})
 	r.Run(`kubectl create ns ns-vl3-nscs-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/vl3-nscs-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/vl3-nscs-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nscs=$(kubectl  get pods -l app=nsc-kernel -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3-nscs-death) ` + "\n" + `[[ ! -z $nscs ]]`)
 	r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + `    ipAddr=$(kubectl exec -n ns-vl3-nscs-death $nsc -- ifconfig nsm-1)` + "\n" + `    ipAddr=$(echo $ipAddr | grep -Eo 'inet addr:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'| cut -c 11-)` + "\n" + `    for pinger in $nscs` + "\n" + `    do` + "\n" + `        echo $pinger pings $ipAddr` + "\n" + `        kubectl exec $pinger -n ns-vl3-nscs-death -- ping -c4 $ipAddr` + "\n" + `    done` + "\n" + `done`)
 	r.Run(`kubectl scale -n ns-vl3-nscs-death deployment nsc-kernel --replicas=0`)
@@ -510,7 +510,7 @@ func (s *Suite) TestVl3_nse_death() {
 		r.Run(`kubectl delete ns ns-vl3-nse-death`)
 	})
 	r.Run(`kubectl create ns ns-vl3-nse-death`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/vl3-nse-death?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/heal/vl3-nse-death?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`nscs=$(kubectl  get pods -l app=nsc-kernel -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3-nse-death) ` + "\n" + `[[ ! -z $nscs ]]`)
 	r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + `    ipAddr=$(kubectl exec -n ns-vl3-nse-death $nsc -- ifconfig nsm-1)` + "\n" + `    ipAddr=$(echo $ipAddr | grep -Eo 'inet addr:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'| cut -c 11-)` + "\n" + `    for pinger in $nscs` + "\n" + `    do` + "\n" + `        echo $pinger pings $ipAddr` + "\n" + `        kubectl exec $pinger -n ns-vl3-nse-death -- ping -c4 $ipAddr` + "\n" + `    done` + "\n" + `done`)
 	r.Run(`NSE=($(kubectl get pods -l app=nse-vl3-vpp -n ns-vl3-nse-death --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')[0])`)
diff --git a/suites/interdomain/nsm/suite.gen.go b/suites/interdomain/nsm/suite.gen.go
index f48b6e02d27..57542586aed 100755
--- a/suites/interdomain/nsm/suite.gen.go
+++ b/suites/interdomain/nsm/suite.gen.go
@@ -23,9 +23,9 @@ func (s *Suite) SetupSuite() {
 	}
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm")
 	s.T().Cleanup(func() {
-		r.Run(`WH=$(kubectl --kubeconfig=$KUBECONFIG1 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete mutatingwebhookconfiguration ${WH}` + "\n" + `` + "\n" + `WH=$(kubectl --kubeconfig=$KUBECONFIG2 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete mutatingwebhookconfiguration ${WH}` + "\n" + `` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+		r.Run(`WH=$(kubectl --kubeconfig=$KUBECONFIG1 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete mutatingwebhookconfiguration ${WH}` + "\n" + `` + "\n" + `WH=$(kubectl --kubeconfig=$KUBECONFIG2 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete mutatingwebhookconfiguration ${WH}` + "\n" + `` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	})
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl --kubeconfig=$KUBECONFIG1 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system` + "\n" + `` + "\n" + `WH=$(kubectl --kubeconfig=$KUBECONFIG2 get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 }
 func (s *Suite) Test() {}
diff --git a/suites/interdomain/nsm_istio_booking/suite.gen.go b/suites/interdomain/nsm_istio_booking/suite.gen.go
index 1c483b73495..e7cc1b854d9 100755
--- a/suites/interdomain/nsm_istio_booking/suite.gen.go
+++ b/suites/interdomain/nsm_istio_booking/suite.gen.go
@@ -31,12 +31,12 @@ func (s *Suite) SetupSuite() {
 	}
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm_istio_booking")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/istio/istio/release-1.13/samples/bookinfo/platform/kube/bookinfo.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio_booking/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18 ` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio_booking/productpage/productpage.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio_booking/networkservice.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns istio-system` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection-` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete pods --all`)
+		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/istio/istio/release-1.13/samples/bookinfo/platform/kube/bookinfo.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio_booking/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f ` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio_booking/productpage/productpage.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio_booking/networkservice.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns istio-system` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection-` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete pods --all`)
 	})
 	r.Run(`curl -sL https://istio.io/downloadIstioctl | sh -` + "\n" + `export PATH=$PATH:$HOME/.istioctl/bin` + "\n" + `istioctl  install --set profile=minimal -y --kubeconfig=$KUBECONFIG2` + "\n" + `istioctl --kubeconfig=$KUBECONFIG2 proxy-status`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio_booking/networkservice.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio_booking/productpage/productpage.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio_booking/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio_booking/networkservice.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio_booking/productpage/productpage.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio_booking/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection=enabled` + "\n" + `` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/istio/istio/release-1.13/samples/bookinfo/platform/kube/bookinfo.yaml`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 wait --timeout=2m --for=condition=ready pod -l app=productpage`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 exec deploy/productpage-v1 -c cmd-nsc -- apk add curl`)
diff --git a/suites/interdomain/spire/suite.gen.go b/suites/interdomain/spire/suite.gen.go
index 4b1a0db2fa6..af926414d19 100755
--- a/suites/interdomain/spire/suite.gen.go
+++ b/suites/interdomain/spire/suite.gen.go
@@ -27,7 +27,7 @@ func (s *Suite) SetupSuite() {
 	})
 	r.Run(`[[ ! -z $KUBECONFIG1 ]]`)
 	r.Run(`[[ ! -z $KUBECONFIG2 ]]`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/spire/cluster1?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/spire/cluster2?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/spire/cluster1?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/spire/cluster2?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`bundle1=$(kubectl --kubeconfig=$KUBECONFIG1 exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `bundle2=$(kubectl --kubeconfig=$KUBECONFIG2 exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)`)
 	r.Run(`echo $bundle2 | kubectl --kubeconfig=$KUBECONFIG1 exec -i spire-server-0 -n spire -- bin/spire-server bundle set -format spiffe -id "spiffe://nsm.cluster2"` + "\n" + `echo $bundle1 | kubectl --kubeconfig=$KUBECONFIG2 exec -i spire-server-0 -n spire -- bin/spire-server bundle set -format spiffe -id "spiffe://nsm.cluster1"`)
diff --git a/suites/interdomain/suite.gen.go b/suites/interdomain/suite.gen.go
index d073bcaebe5..3aa8b9c8dd2 100755
--- a/suites/interdomain/suite.gen.go
+++ b/suites/interdomain/suite.gen.go
@@ -34,25 +34,25 @@ func (s *Suite) TestNsm_consul() {
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm_consul")
 	s.T().Cleanup(func() {
 		r.Run(`kubectl --kubeconfig=$KUBECONFIG1 delete deployment counting`)
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_consul/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/client/dashboard.yaml`)
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/networkservice.yaml`)
+		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_consul/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+		r.Run(`kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/client/dashboard.yaml`)
+		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/networkservice.yaml`)
 		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete pods --all`)
 		r.Run(`consul-k8s uninstall --kubeconfig=$KUBECONFIG2 -auto-approve=true -wipe-data=true`)
 	})
 	r.Run(`brew tap hashicorp/tap` + "\n" + `brew install hashicorp/tap/consul-k8s`)
 	r.Run(`consul-k8s install -config-file=helm-consul-values.yaml -set global.image=hashicorp/consul:1.12.0 -auto-approve --kubeconfig=$KUBECONFIG2`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/networkservice.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/client/dashboard.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/service.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_consul/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/server/counting.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/networkservice.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/client/dashboard.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/service.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_consul/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/server/counting.yaml`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 wait --timeout=5m --for=condition=ready pod -l app=dashboard-nsc`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 exec pod/dashboard-nsc -c cmd-nsc -- apk add curl`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 exec pod/dashboard-nsc -c cmd-nsc -- curl counting:9001`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 port-forward pod/dashboard-nsc 9002:9002 &`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete deploy counting`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_consul/server/counting_nsm.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_consul/server/counting_nsm.yaml`)
 }
 func (s *Suite) TestNsm_consul_vl3() {
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm_consul_vl3")
@@ -124,13 +124,13 @@ func (s *Suite) TestNsm_consul_vl3() {
 func (s *Suite) TestNsm_istio() {
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm_istio")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/greeting/server.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/greeting/client.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/networkservice.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns istio-system` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection-` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete pods --all`)
+		r.Run(`kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/greeting/server.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/greeting/client.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/networkservice.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns istio-system` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection-` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete pods --all`)
 	})
 	r.Run(`curl -sL https://istio.io/downloadIstioctl | sh -` + "\n" + `export PATH=$PATH:$HOME/.istioctl/bin` + "\n" + `istioctl  install --set profile=minimal -y --kubeconfig=$KUBECONFIG2` + "\n" + `istioctl --kubeconfig=$KUBECONFIG2 proxy-status`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/networkservice.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/greeting/client.yaml`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio/nse-auto-scale?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection=enabled` + "\n" + `` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/examples/interdomain/nsm_istio/greeting/server.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/networkservice.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/greeting/client.yaml`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_istio/nse-auto-scale?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 label namespace default istio-injection=enabled` + "\n" + `` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_istio/greeting/server.yaml`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 wait --timeout=2m --for=condition=ready pod -l app=alpine`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 exec deploy/alpine -c cmd-nsc -- apk add curl`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 exec deploy/alpine -c cmd-nsc -- curl -s greeting.default:9080 | grep -o "hello world from istio"`)
@@ -138,18 +138,18 @@ func (s *Suite) TestNsm_istio() {
 func (s *Suite) TestNsm_kuma_universal_vl3() {
 	r := s.Runner("../deployments-k8s/examples/interdomain/nsm_kuma_universal_vl3")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl --kubeconfig=$KUBECONFIG1 delete ns kuma-system kuma-demo ns-dns-vl3` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns kuma-demo` + "\n" + `rm tls.crt tls.key ca.crt` + "\n" + `rm -rf kuma-1.7.0`)
+		r.Run(`pkill -f "port-forward"` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 delete ns kuma-system kuma-demo ns-dns-vl3` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 delete ns kuma-demo` + "\n" + `rm tls.crt tls.key ca.crt` + "\n" + `rm -rf kuma-1.7.0 control-plane`)
 	})
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k ./vl3-dns` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 -n ns-dns-vl3 wait --for=condition=ready --timeout=2m pod -l app=vl3-ipam`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k https://github.com/networkservicemesh/deployments-k8s/examples/interdomain/nsm_kuma_universal_vl3/vl3-dns?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 -n ns-dns-vl3 wait --for=condition=ready --timeout=5m pod -l app=vl3-ipam`)
 	r.Run(`curl -L https://kuma.io/installer.sh | VERSION=1.7.0 ARCH=amd64 bash -` + "\n" + `export PATH=$PWD/kuma-1.7.0/bin:$PATH`)
 	r.Run(`kumactl generate tls-certificate --hostname=control-plane-kuma.my-vl3-network --hostname=kuma-control-plane.kuma-system.svc --type=server --key-file=./tls.key --cert-file=./tls.crt`)
 	r.Run(`cp ./tls.crt ./ca.crt`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f namespace.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 create secret generic general-tls-certs --namespace=kuma-system --from-file=./tls.key --from-file=./tls.crt --from-file=./ca.crt`)
+	r.Run(`mkdir -p control-plane` + "\n" + `cat > ./control-plane/kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `resources:` + "\n" + `- control-plane.yaml` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_kuma_universal_vl3/control-plane/patch-control-plane.yaml` + "\n" + `EOF`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_kuma_universal_vl3/namespace.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 create secret generic general-tls-certs --namespace=kuma-system --from-file=./tls.key --from-file=./tls.crt --from-file=./ca.crt`)
 	r.Run(`kumactl install control-plane --tls-general-secret=general-tls-certs --tls-general-ca-bundle=$(cat ./ca.crt | base64) > ./control-plane/control-plane.yaml`)
 	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -k ./control-plane`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f demo-redis.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 -n kuma-demo wait --for=condition=ready --timeout=3m pod -l app=redis`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f demo-app.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 -n kuma-demo wait --for=condition=ready --timeout=3m pod -l app=demo-app`)
-	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 port-forward svc/demo-app -n kuma-demo 5000:5000 &`)
-	r.Run(`response=$(curl -X POST localhost:5000/increment)`)
-	r.Run(`echo $response | grep '"err":null'`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG1 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_kuma_universal_vl3/demo-redis.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG1 -n kuma-demo wait --for=condition=ready --timeout=3m pod -l app=redis`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/examples/interdomain/nsm_kuma_universal_vl3/demo-app.yaml` + "\n" + `kubectl --kubeconfig=$KUBECONFIG2 -n kuma-demo wait --for=condition=ready --timeout=3m pod -l app=demo-app`)
+	r.Run(`kubectl --kubeconfig=$KUBECONFIG2 port-forward svc/demo-app -n kuma-demo 8081:5000 &`)
+	r.Run(`response=$(curl -X POST localhost:8081/increment)` + "\n" + `echo $response | grep '"err":null'`)
 }
diff --git a/suites/k8s_monolith/external_nsc/docker/suite.gen.go b/suites/k8s_monolith/external_nsc/docker/suite.gen.go
index 2871d3b2d40..0f275d06f21 100755
--- a/suites/k8s_monolith/external_nsc/docker/suite.gen.go
+++ b/suites/k8s_monolith/external_nsc/docker/suite.gen.go
@@ -26,7 +26,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`docker compose -f docker-compose.yaml -f docker-compose.override.yaml down`)
 	})
 	r.Run(`cat > docker-compose.override.yaml <<EOF` + "\n" + `---` + "\n" + `networks:` + "\n" + `  kind:` + "\n" + `    external: true` + "\n" + `` + "\n" + `services:` + "\n" + `  nsc-simple-docker:` + "\n" + `    networks:` + "\n" + `      - kind` + "\n" + `    environment:` + "\n" + `      NSM_NETWORK_SERVICES: kernel://kernel2wireguard2kernel-monolith-nsc@k8s.nsm/nsm-1` + "\n" + `EOF`)
-	r.Run(`curl https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/apps/nsc-simple-docker/docker-compose.yaml -o docker-compose.yaml`)
+	r.Run(`curl https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/apps/nsc-simple-docker/docker-compose.yaml -o docker-compose.yaml`)
 	r.Run(`docker compose -f docker-compose.yaml -f docker-compose.override.yaml up -d`)
 }
 func (s *Suite) Test() {}
diff --git a/suites/k8s_monolith/external_nsc/spire/suite.gen.go b/suites/k8s_monolith/external_nsc/spire/suite.gen.go
index 69df63331ac..660d06b963c 100755
--- a/suites/k8s_monolith/external_nsc/spire/suite.gen.go
+++ b/suites/k8s_monolith/external_nsc/spire/suite.gen.go
@@ -25,7 +25,7 @@ func (s *Suite) SetupSuite() {
 	s.T().Cleanup(func() {
 		r.Run(`kubectl delete crd spiffeids.spiffeid.spiffe.io` + "\n" + `kubectl delete ns spire`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/spire?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/spire?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`bundlek8s=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `bundledock=$(docker exec nsc-simple-docker bin/spire-server bundle show -format spiffe)` + "\n" + `echo $bundledock | kubectl exec -i spire-server-0 -n spire -- bin/spire-server bundle set -format spiffe -id "spiffe://docker.nsm/cmd-nsc-simple-docker"` + "\n" + `echo $bundlek8s | docker exec -i nsc-simple-docker bin/spire-server bundle set -format spiffe -id "spiffe://k8s.nsm"`)
diff --git a/suites/k8s_monolith/external_nsc/suite.gen.go b/suites/k8s_monolith/external_nsc/suite.gen.go
index a4529e7ab55..b340475d768 100755
--- a/suites/k8s_monolith/external_nsc/suite.gen.go
+++ b/suites/k8s_monolith/external_nsc/suite.gen.go
@@ -32,7 +32,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/cluster?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/cluster?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl get services registry -n nsm-system -o go-template='{{index (index (index (index .status "loadBalancer") "ingress") 0) "ip"}}'`)
 }
 func (s *Suite) TestKernel2Wireguard2Kernel() {
@@ -41,7 +41,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-monolith-nsc`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2kernel-monolith-nsc`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/external_nsc/usecases/Kernel2Wireguard2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/external_nsc/usecases/Kernel2Wireguard2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel-monolith-nsc`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-kernel2wireguard2kernel-monolith-nsc --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`docker exec nsc-simple-docker ping -c4 172.16.1.100`)
diff --git a/suites/k8s_monolith/external_nse/docker/suite.gen.go b/suites/k8s_monolith/external_nse/docker/suite.gen.go
index 76382692b41..0706862416f 100755
--- a/suites/k8s_monolith/external_nse/docker/suite.gen.go
+++ b/suites/k8s_monolith/external_nse/docker/suite.gen.go
@@ -26,7 +26,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`docker compose -f docker-compose.yaml -f docker-compose.override.yaml down`)
 	})
 	r.Run(`cat > docker-compose.override.yaml <<EOF` + "\n" + `---` + "\n" + `networks:` + "\n" + `  kind:` + "\n" + `    external: true` + "\n" + `` + "\n" + `services:` + "\n" + `  nse-simple-vl3-docker:` + "\n" + `    networks:` + "\n" + `      - kind` + "\n" + `    environment:` + "\n" + `      NSM_SERVICE_NAMES: kernel2wireguard2kernel-monolith-nse` + "\n" + `      NSM_REGISTER_SERVICE: false` + "\n" + `EOF`)
-	r.Run(`curl https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/8c7217843c12ffeb9eee8e6ba5ac916c7e475f18/apps/nse-simple-vl3-docker/docker-compose.yaml -o docker-compose.yaml`)
+	r.Run(`curl https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f/apps/nse-simple-vl3-docker/docker-compose.yaml -o docker-compose.yaml`)
 	r.Run(`docker compose -f docker-compose.yaml -f docker-compose.override.yaml up -d`)
 }
 func (s *Suite) Test() {}
diff --git a/suites/k8s_monolith/external_nse/spire/suite.gen.go b/suites/k8s_monolith/external_nse/spire/suite.gen.go
index d2318c31640..f6af1310816 100755
--- a/suites/k8s_monolith/external_nse/spire/suite.gen.go
+++ b/suites/k8s_monolith/external_nse/spire/suite.gen.go
@@ -25,7 +25,7 @@ func (s *Suite) SetupSuite() {
 	s.T().Cleanup(func() {
 		r.Run(`kubectl delete crd spiffeids.spiffeid.spiffe.io` + "\n" + `kubectl delete ns spire`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/spire?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/spire?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 	r.Run(`bundlek8s=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `bundledock=$(docker exec nse-simple-vl3-docker bin/spire-server bundle show -format spiffe)` + "\n" + `echo $bundledock | kubectl exec -i spire-server-0 -n spire -- bin/spire-server bundle set -format spiffe -id "spiffe://docker.nsm/cmd-nse-simple-vl3-docker"` + "\n" + `echo $bundlek8s | docker exec -i nse-simple-vl3-docker bin/spire-server bundle set -format spiffe -id "spiffe://k8s.nsm"`)
diff --git a/suites/k8s_monolith/external_nse/suite.gen.go b/suites/k8s_monolith/external_nse/suite.gen.go
index 9cfe4c8e850..dc5165c84dc 100755
--- a/suites/k8s_monolith/external_nse/suite.gen.go
+++ b/suites/k8s_monolith/external_nse/suite.gen.go
@@ -32,7 +32,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/cluster?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/configuration/cluster?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl get services registry -n nsm-system -o go-template='{{index (index (index (index .status "loadBalancer") "ingress") 0) "ip"}}'`)
 }
 func (s *Suite) TestKernel2Wireguard2Kernel() {
@@ -41,7 +41,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-monolith-nse`)
 	})
 	r.Run(`kubectl create ns ns-kernel2wireguard2kernel-monolith-nse`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/external_nse/usecases/Kernel2Wireguard2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/k8s_monolith/external_nse/usecases/Kernel2Wireguard2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-kernel2wireguard2kernel-monolith-nse`)
 	r.Run(`nscs=$(kubectl  get pods -l app=nsc-kernel -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-kernel2wireguard2kernel-monolith-nse)` + "\n" + `[[ ! -z $nscs ]]`)
 	r.Run(`for nsc in $nscs` + "\n" + `do` + "\n" + `    ipAddr=$(kubectl exec -n ns-kernel2wireguard2kernel-monolith-nse $nsc -- ifconfig nsm-1)` + "\n" + `    ipAddr=$(echo $ipAddr | grep -Eo 'inet addr:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'| cut -c 11-)` + "\n" + `    for pinger in $nscs` + "\n" + `    do` + "\n" + `        echo $pinger pings $ipAddr` + "\n" + `        kubectl exec $pinger -n ns-kernel2wireguard2kernel-monolith-nse -- ping -c4 $ipAddr` + "\n" + `    done` + "\n" + `done`)
diff --git a/suites/memory/suite.gen.go b/suites/memory/suite.gen.go
index 4d501743823..4d9cfec51a2 100755
--- a/suites/memory/suite.gen.go
+++ b/suites/memory/suite.gen.go
@@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 }
 func (s *Suite) TestKernel2Kernel() {
@@ -37,7 +37,7 @@ func (s *Suite) TestKernel2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Kernel2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Kernel2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -51,7 +51,7 @@ func (s *Suite) TestKernel2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2vxlan2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2vxlan2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Kernel2Vxlan2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Kernel2Vxlan2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2vxlan2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -65,7 +65,7 @@ func (s *Suite) TestMemif2Memif() {
 		r.Run(`kubectl delete ns ns-memif2memif`)
 	})
 	r.Run(`kubectl create ns ns-memif2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Memif2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory/Memif2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
diff --git a/suites/multiforwarder/suite.gen.go b/suites/multiforwarder/suite.gen.go
index e529d75a28f..bf6941a7caa 100755
--- a/suites/multiforwarder/suite.gen.go
+++ b/suites/multiforwarder/suite.gen.go
@@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 }
 func (s *Suite) TestKernel2Kernel() {
@@ -37,7 +37,7 @@ func (s *Suite) TestKernel2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -57,7 +57,7 @@ func (s *Suite) TestKernel2Kernel_Vfio2Noop() {
 	r.Run(`CLIENT_MAC=$(mac_create)` + "\n" + `echo Client MAC: ${CLIENT_MAC}`)
 	r.Run(`SERVER_MAC=$(mac_create)` + "\n" + `echo Server MAC: ${SERVER_MAC}`)
 	r.Run(`cat > patch-nse-vfio.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-vfio` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: sidecar` + "\n" + `          env:` + "\n" + `            - name: NSM_SERVICES` + "\n" + `              value: "pingpong@worker.domain: { addr: ${SERVER_MAC} }"` + "\n" + `        - name: ponger` + "\n" + `          command: ["/bin/bash", "/root/scripts/pong.sh", "ens6f3", "31", ${SERVER_MAC}]` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel&Vfio2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel&Vfio2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-kernel2kernel-vfio2noop`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-vfio2noop`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-vfio -n ns-kernel2kernel-vfio2noop`)
@@ -76,7 +76,7 @@ func (s *Suite) TestKernel2Vxlan2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2vxlan2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2vxlan2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2vxlan2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -96,7 +96,7 @@ func (s *Suite) TestKernel2Vxlan2Kernel_Vfio2Noop() {
 	r.Run(`CLIENT_MAC=$(mac_create)` + "\n" + `echo Client MAC: ${CLIENT_MAC}`)
 	r.Run(`SERVER_MAC=$(mac_create)` + "\n" + `echo Server MAC: ${SERVER_MAC}`)
 	r.Run(`cat > patch-nse-vfio.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-vfio` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: sidecar` + "\n" + `          env:` + "\n" + `            - name: NSM_SERVICES` + "\n" + `              value: "pingpong@worker.domain: { addr: ${SERVER_MAC} }"` + "\n" + `        - name: ponger` + "\n" + `          command: ["/bin/bash", "/root/scripts/pong.sh", "ens6f3", "31", ${SERVER_MAC}]` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel&Vfio2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel&Vfio2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-kernel2vxlan2kernel-vfio2noop`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2vxlan2kernel-vfio2noop`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-vfio -n ns-kernel2vxlan2kernel-vfio2noop`)
@@ -115,7 +115,7 @@ func (s *Suite) TestMemif2Memif() {
 		r.Run(`kubectl delete ns ns-memif2memif`)
 	})
 	r.Run(`kubectl create ns ns-memif2memif`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2memif`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2memif`)
 	r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -129,7 +129,7 @@ func (s *Suite) TestSriovKernel2Noop() {
 		r.Run(`kubectl delete ns ns-sriov-kernel2noop`)
 	})
 	r.Run(`kubectl create ns ns-sriov-kernel2noop`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SriovKernel2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SriovKernel2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=nse-kernel`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=ponger`)
@@ -148,7 +148,7 @@ func (s *Suite) TestVfio2Noop() {
 	r.Run(`CLIENT_MAC=$(mac_create)` + "\n" + `echo Client MAC: ${CLIENT_MAC}`)
 	r.Run(`SERVER_MAC=$(mac_create)` + "\n" + `echo Server MAC: ${SERVER_MAC}`)
 	r.Run(`cat > patch-nse-vfio.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-vfio` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: sidecar` + "\n" + `          env:` + "\n" + `            - name: NSM_SERVICES` + "\n" + `              value: "pingpong@worker.domain: { addr: ${SERVER_MAC} }"` + "\n" + `        - name: ponger` + "\n" + `          command: ["/bin/bash", "/root/scripts/pong.sh", "ens6f3", "31", ${SERVER_MAC}]` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Vfio2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Vfio2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n ns-vfio2noop wait --for=condition=ready --timeout=1m pod -l app=nsc-vfio`)
 	r.Run(`kubectl -n ns-vfio2noop wait --for=condition=ready --timeout=1m pod -l app=nse-vfio`)
 	r.Run(`NSC_VFIO=$(kubectl -n ns-vfio2noop get pods -l app=nsc-vfio --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
diff --git a/suites/observability/suite.gen.go b/suites/observability/suite.gen.go
index da7fa148365..3dee0ac3e3c 100755
--- a/suites/observability/suite.gen.go
+++ b/suites/observability/suite.gen.go
@@ -31,20 +31,20 @@ func (s *Suite) TestJaeger_and_prometheus() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 		r.Run(`kubectl describe pods -n observability` + "\n" + `kubectl delete ns observability` + "\n" + `pkill -f "port-forward"`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n observability --timeout=1m --for=condition=ready pod -l app=opentelemetry`)
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus/nsm-system?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus/nsm-system?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 	r.Run(`kubectl create ns ns-jaeger-and-prometheus`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus/example?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/observability/jaeger-and-prometheus/example?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-jaeger-and-prometheus`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-jaeger-and-prometheus`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-jaeger-and-prometheus --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-jaeger-and-prometheus --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl exec ${NSC} -n ns-jaeger-and-prometheus -- ping -c 4 172.16.1.100`)
 	r.Run(`kubectl exec ${NSE} -n ns-jaeger-and-prometheus -- ping -c 4 172.16.1.101`)
-	r.Run(`NODES=($(kubectl get nodes -o go-template='{{range .items}}{{ if not .spec.taints  }}{{index .metadata.labels "kubernetes.io/hostname"}} {{end}}{{end}}'))` + "\n" + `FORWARDER=$(kubectl get pods -l app=forwarder-vpp --field-selector spec.nodeName==${NODES[0]} -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
+	r.Run(`NSE_NODE=$(kubectl get pods -l app=nse-kernel -n ns-jaeger-and-prometheus --template '{{range .items}}{{.spec.nodeName}}{{"\n"}}{{end}}')` + "\n" + `FORWARDER=$(kubectl get pods -l app=forwarder-vpp --field-selector spec.nodeName==${NSE_NODE} -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
 	r.Run(`kubectl port-forward service/jaeger -n observability 16686:16686 2>&1 > /dev/null &` + "\n" + `kubectl port-forward service/prometheus -n observability 9090:9090 2>&1 > /dev/null &`)
 	r.Run(`result=$(curl -X GET localhost:16686/api/traces?service=${FORWARDER}&lookback=5m&limit=1)` + "\n" + `echo ${result}` + "\n" + `echo ${result} | grep -q "forwarder"`)
 	r.Run(`FORWARDER=${FORWARDER//-/_}`)
diff --git a/suites/ovs/suite.gen.go b/suites/ovs/suite.gen.go
index c49ffa2208f..aa055cf46e4 100755
--- a/suites/ovs/suite.gen.go
+++ b/suites/ovs/suite.gen.go
@@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/ovs?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/ovs?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
 }
 func (s *Suite) TestWebhook_smartvf() {
@@ -38,7 +38,7 @@ func (s *Suite) TestWebhook_smartvf() {
 	})
 	r.Run(`kubectl create ns ns-webhook`)
 	r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook-smartvf?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook-smartvf?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nse-kernel -n ns-webhook-smartvf`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod postgres-cl -n ns-webhook-smartvf`)
 	r.Run(`NSC=$(kubectl get pods -l app=postgres-cl -n ns-webhook-smartvf --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -51,7 +51,7 @@ func (s *Suite) TestKernel2Kernel() {
 		r.Run(`kubectl delete ns ns-kernel2kernel`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel`)
 	r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
@@ -65,7 +65,7 @@ func (s *Suite) TestKernel2KernelVLAN() {
 		r.Run(`kubectl delete ns ns-kernel2kernel-vlan`)
 	})
 	r.Run(`kubectl create ns ns-kernel2kernel-vlan`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2KernelVLAN?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2KernelVLAN?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-kernel2kernel-vlan`)
 	r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-vlan`)
 	r.Run(`NSC=$((kubectl get pods -l app=nsc-kernel -n ns-kernel2kernel-vlan --template '{{range .items}}{{.metadata.name}}{{" "}}{{end}}') | cut -d' ' -f1)` + "\n" + `TARGET_IP=$(kubectl exec -ti ${NSC} -n ns-kernel2kernel-vlan -- ip route show | grep 172.16 | cut -d' ' -f1)`)
@@ -78,7 +78,7 @@ func (s *Suite) TestSmartVF2SmartVF() {
 		r.Run(`kubectl delete ns ns-smartvf2smartvf`)
 	})
 	r.Run(`kubectl create ns ns-smartvf2smartvf`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SmartVF2SmartVF?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SmartVF2SmartVF?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n ns-smartvf2smartvf wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel`)
 	r.Run(`kubectl -n ns-smartvf2smartvf wait --for=condition=ready --timeout=1m pod -l app=nse-kernel`)
 	r.Run(`NSC=$(kubectl -n ns-smartvf2smartvf get pods -l app=nsc-kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)
diff --git a/suites/remotevlan/rvlanovs/suite.gen.go b/suites/remotevlan/rvlanovs/suite.gen.go
index 2fd79e65fe2..8631d2d76f9 100755
--- a/suites/remotevlan/rvlanovs/suite.gen.go
+++ b/suites/remotevlan/rvlanovs/suite.gen.go
@@ -23,9 +23,9 @@ func (s *Suite) SetupSuite() {
 	}
 	r := s.Runner("../deployments-k8s/examples/remotevlan/rvlanovs")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanovs?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+		r.Run(`kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanovs?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanovs?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanovs?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n nsm-system wait --for=condition=ready --timeout=2m pod -l app=forwarder-ovs`)
 }
 func (s *Suite) TestKernel2RVlanBreakout() {
@@ -79,7 +79,7 @@ func (s *Suite) TestKernel2RVlanMultiNS() {
 	r.Run(`kubectl apply -k ./ns-1`)
 	r.Run(`cat > ns-2/second-client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-2` + "\n" + `  labels:` + "\n" + `    app: alpine-2` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-2` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-2` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://blue-bridge.ns-kernel2vlan-multins-2/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-2` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF` + "\n" + `cat > ns-2/third-client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-3` + "\n" + `  labels:` + "\n" + `    app: alpine-3` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-3` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-3` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://green-bridge.ns-kernel2vlan-multins-2/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-3` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF`)
 	r.Run(`cat > ns-2/patch-nse.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-remote-vlan` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `      - name: nse` + "\n" + `        env:` + "\n" + `          - name: NSM_CONNECT_TO` + "\n" + `            value: "registry.nsm-system:5002"` + "\n" + `          - name: NSM_SERVICES` + "\n" + `            value: "blue-bridge.ns-kernel2vlan-multins-2 { vlan: 300; via: gw1 }, green-bridge.ns-kernel2vlan-multins-2 { vlan: 400; via: gw1 }"` + "\n" + `          - name: NSM_CIDR_PREFIX` + "\n" + `            value: 172.10.2.0/24` + "\n" + `EOF`)
-	r.Run(`cat > ns-2/kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ns-kernel2vlan-multins-2` + "\n" + `` + "\n" + `resources:` + "\n" + `- second-client.yaml` + "\n" + `- third-client.yaml` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-remote-vlan?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `nameSuffix: -bg` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
+	r.Run(`cat > ns-2/kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ns-kernel2vlan-multins-2` + "\n" + `` + "\n" + `resources:` + "\n" + `- second-client.yaml` + "\n" + `- third-client.yaml` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-remote-vlan?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `nameSuffix: -bg` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k ./ns-2`)
 	r.Run(`cat > client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-4` + "\n" + `  labels:` + "\n" + `    app: alpine-4` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-4` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-4` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://finance-bridge/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-4` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF`)
 	r.Run(`kubectl apply -n nsm-system -f client.yaml`)
diff --git a/suites/remotevlan/rvlanvpp/suite.gen.go b/suites/remotevlan/rvlanvpp/suite.gen.go
index 69490668afe..73be1b0abfa 100755
--- a/suites/remotevlan/rvlanvpp/suite.gen.go
+++ b/suites/remotevlan/rvlanvpp/suite.gen.go
@@ -23,9 +23,9 @@ func (s *Suite) SetupSuite() {
 	}
 	r := s.Runner("../deployments-k8s/examples/remotevlan/rvlanvpp")
 	s.T().Cleanup(func() {
-		r.Run(`kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanvpp?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+		r.Run(`kubectl delete -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanvpp?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanvpp?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/remotevlan/rvlanvpp?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n nsm-system wait --for=condition=ready --timeout=2m pod -l app=forwarder-vpp`)
 }
 func (s *Suite) TestKernel2RVlanBreakout() {
@@ -79,7 +79,7 @@ func (s *Suite) TestKernel2RVlanMultiNS() {
 	r.Run(`kubectl apply -k ./ns-1`)
 	r.Run(`cat > ns-2/second-client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-2` + "\n" + `  labels:` + "\n" + `    app: alpine-2` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-2` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-2` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://blue-bridge.ns-kernel2vlan-multins-2/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-2` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF` + "\n" + `cat > ns-2/third-client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-3` + "\n" + `  labels:` + "\n" + `    app: alpine-3` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-3` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-3` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://green-bridge.ns-kernel2vlan-multins-2/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-3` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF`)
 	r.Run(`cat > ns-2/patch-nse.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-remote-vlan` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `      - name: nse` + "\n" + `        env:` + "\n" + `          - name: NSM_CONNECT_TO` + "\n" + `            value: "registry.nsm-system:5002"` + "\n" + `          - name: NSM_SERVICES` + "\n" + `            value: "blue-bridge.ns-kernel2vlan-multins-2 { vlan: 300; via: gw1 }, green-bridge.ns-kernel2vlan-multins-2 { vlan: 400; via: gw1 }"` + "\n" + `          - name: NSM_CIDR_PREFIX` + "\n" + `            value: 172.10.2.0/24` + "\n" + `EOF`)
-	r.Run(`cat > ns-2/kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ns-kernel2vlan-multins-2` + "\n" + `` + "\n" + `resources:` + "\n" + `- second-client.yaml` + "\n" + `- third-client.yaml` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-remote-vlan?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18` + "\n" + `` + "\n" + `nameSuffix: -bg` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
+	r.Run(`cat > ns-2/kustomization.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: kustomize.config.k8s.io/v1beta1` + "\n" + `kind: Kustomization` + "\n" + `` + "\n" + `namespace: ns-kernel2vlan-multins-2` + "\n" + `` + "\n" + `resources:` + "\n" + `- second-client.yaml` + "\n" + `- third-client.yaml` + "\n" + `` + "\n" + `bases:` + "\n" + `- https://github.com/networkservicemesh/deployments-k8s/apps/nse-remote-vlan?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f` + "\n" + `` + "\n" + `nameSuffix: -bg` + "\n" + `` + "\n" + `patchesStrategicMerge:` + "\n" + `- patch-nse.yaml` + "\n" + `EOF`)
 	r.Run(`kubectl apply -k ./ns-2`)
 	r.Run(`cat > client.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: alpine-4` + "\n" + `  labels:` + "\n" + `    app: alpine-4` + "\n" + `spec:` + "\n" + `  replicas: 2` + "\n" + `  selector:` + "\n" + `    matchLabels:` + "\n" + `      app: alpine-4` + "\n" + `  template:` + "\n" + `    metadata:` + "\n" + `      labels:` + "\n" + `        app: alpine-4` + "\n" + `      annotations:` + "\n" + `        networkservicemesh.io: kernel://finance-bridge/nsm-1` + "\n" + `    spec:` + "\n" + `      affinity:` + "\n" + `        podAntiAffinity:` + "\n" + `          requiredDuringSchedulingIgnoredDuringExecution:` + "\n" + `          - labelSelector:` + "\n" + `              matchExpressions:` + "\n" + `              - key: app` + "\n" + `                operator: In` + "\n" + `                values:` + "\n" + `                - alpine-4` + "\n" + `            topologyKey: "kubernetes.io/hostname"` + "\n" + `      containers:` + "\n" + `      - name: alpine` + "\n" + `        image: alpine:3.15.0` + "\n" + `        imagePullPolicy: IfNotPresent` + "\n" + `        stdin: true` + "\n" + `        tty: true` + "\n" + `EOF`)
 	r.Run(`kubectl apply -n nsm-system -f client.yaml`)
diff --git a/suites/spire/suite.gen.go b/suites/spire/suite.gen.go
index 0a7becce57e..8e45f24d4f2 100755
--- a/suites/spire/suite.gen.go
+++ b/suites/spire/suite.gen.go
@@ -25,7 +25,7 @@ func (s *Suite) SetupSuite() {
 	s.T().Cleanup(func() {
 		r.Run(`kubectl delete crd spiffeids.spiffeid.spiffe.io` + "\n" + `kubectl delete ns spire`)
 	})
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/spire?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/spire?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl wait -n spire --timeout=2m --for=condition=ready pod -l app=spire-agent`)
 	r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`)
 }
diff --git a/suites/sriov/suite.gen.go b/suites/sriov/suite.gen.go
index 6c237a03273..526167a6d2a 100755
--- a/suites/sriov/suite.gen.go
+++ b/suites/sriov/suite.gen.go
@@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() {
 		r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`)
 	})
 	r.Run(`kubectl create ns nsm-system`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 }
 func (s *Suite) TestSriovKernel2Noop() {
 	r := s.Runner("../deployments-k8s/examples/use-cases/SriovKernel2Noop")
@@ -36,7 +36,7 @@ func (s *Suite) TestSriovKernel2Noop() {
 		r.Run(`kubectl delete ns ns-sriov-kernel2noop`)
 	})
 	r.Run(`kubectl create ns ns-sriov-kernel2noop`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SriovKernel2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/SriovKernel2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=nse-kernel`)
 	r.Run(`kubectl -n ns-sriov-kernel2noop wait --for=condition=ready --timeout=1m pod -l app=ponger`)
@@ -55,7 +55,7 @@ func (s *Suite) TestVfio2Noop() {
 	r.Run(`CLIENT_MAC=$(mac_create)` + "\n" + `echo Client MAC: ${CLIENT_MAC}`)
 	r.Run(`SERVER_MAC=$(mac_create)` + "\n" + `echo Server MAC: ${SERVER_MAC}`)
 	r.Run(`cat > patch-nse-vfio.yaml <<EOF` + "\n" + `---` + "\n" + `apiVersion: apps/v1` + "\n" + `kind: Deployment` + "\n" + `metadata:` + "\n" + `  name: nse-vfio` + "\n" + `spec:` + "\n" + `  template:` + "\n" + `    spec:` + "\n" + `      containers:` + "\n" + `        - name: sidecar` + "\n" + `          env:` + "\n" + `            - name: NSM_SERVICES` + "\n" + `              value: "pingpong@worker.domain: { addr: ${SERVER_MAC} }"` + "\n" + `        - name: ponger` + "\n" + `          command: ["/bin/bash", "/root/scripts/pong.sh", "ens6f3", "31", ${SERVER_MAC}]` + "\n" + `EOF`)
-	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Vfio2Noop?ref=8c7217843c12ffeb9eee8e6ba5ac916c7e475f18`)
+	r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Vfio2Noop?ref=6678e2c7004de9158c62a1b1ac8abf8f6f3e4f5f`)
 	r.Run(`kubectl -n ns-vfio2noop wait --for=condition=ready --timeout=1m pod -l app=nsc-vfio`)
 	r.Run(`kubectl -n ns-vfio2noop wait --for=condition=ready --timeout=1m pod -l app=nse-vfio`)
 	r.Run(`NSC_VFIO=$(kubectl -n ns-vfio2noop get pods -l app=nsc-vfio --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`)