diff --git a/pkg/resourcewatch/controller/configmonitor/crd_controller.go b/pkg/resourcewatch/controller/configmonitor/crd_controller.go
index ccfeed61c652..bb6a711eb7c6 100644
--- a/pkg/resourcewatch/controller/configmonitor/crd_controller.go
+++ b/pkg/resourcewatch/controller/configmonitor/crd_controller.go
@@ -4,6 +4,7 @@ import (
 	"k8s.io/client-go/dynamic/dynamicinformer"
 	"k8s.io/klog/v2"
 
+	kapi "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"
 )
@@ -32,6 +33,9 @@ func WireResourceInformersToGitRepo(
 		dynamicInformer.AddEventHandler(
 			cache.ResourceEventHandlerFuncs{
 				AddFunc: func(obj interface{}) {
+					if pod, ok := obj.(*kapi.Pod); ok {
+						klog.Errorf("KEYWORD: got add for pod %s/%s", pod.Namespace, pod.Name)
+					}
 					gitStorage.OnAdd(resourceToWatch, obj)
 				},
 				UpdateFunc: func(oldObj, newObj interface{}) {
diff --git a/pkg/resourcewatch/operator/starter.go b/pkg/resourcewatch/operator/starter.go
index ae436760152b..da2c62c494d1 100644
--- a/pkg/resourcewatch/operator/starter.go
+++ b/pkg/resourcewatch/operator/starter.go
@@ -48,7 +48,7 @@ func RunResourceWatch() error {
 		return err
 	}
 
-	repositoryPath := "/repository"
+	repositoryPath := "./repository"
 	if repositoryPathEnv := os.Getenv("REPOSITORY_PATH"); len(repositoryPathEnv) > 0 {
 		repositoryPath = repositoryPathEnv
 	}
diff --git a/pkg/resourcewatch/storage/git_store.go b/pkg/resourcewatch/storage/git_store.go
index 31452ee12e3b..263750253584 100644
--- a/pkg/resourcewatch/storage/git_store.go
+++ b/pkg/resourcewatch/storage/git_store.go
@@ -15,6 +15,7 @@ import (
 
 	"gopkg.in/src-d/go-git.v4"
 
+	kapi "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -228,6 +229,9 @@ func (s *GitStorage) OnUpdate(gvr schema.GroupVersionResource, oldObj, obj inter
 	// start new go func to allow parallel processing where possible and to avoid blocking all progress on retries.
 	go func() {
 		defer s.currentlyRecording.release(key)
+		if pod, ok := obj.(*kapi.Pod); ok {
+			klog.Errorf("KEYWORD: starting goroutine for %s/%s", pod.Namespace, pod.Name)
+		}
 		s.handle(gvr, oldObjUnstructured, objUnstructured, false)
 	}()
 }
diff --git a/test/extended/networking/network_segmentation.go b/test/extended/networking/network_segmentation.go
index 9d77bf0c742f..ee6ca489c15b 100644
--- a/test/extended/networking/network_segmentation.go
+++ b/test/extended/networking/network_segmentation.go
@@ -372,32 +372,17 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
 
 						red := "red"
 						blue := "blue"
-
-						namespaceRed := f.Namespace.Name + "-" + red
-						namespaceBlue := f.Namespace.Name + "-" + blue
+						namespaceRed, err := f.CreateNamespace(context.Background(), "network-segmentation-"+red, nil)
+						Expect(err).NotTo(HaveOccurred())
+						namespaceBlue, err := f.CreateNamespace(context.Background(), "network-segmentation-"+blue, nil)
+						Expect(err).NotTo(HaveOccurred())
 
 						netConfig := networkAttachmentConfigParams{
 							topology: topology,
 							cidr:     correctCIDRFamily(oc, userDefinedv4Subnet, userDefinedv6Subnet),
 							role:     "primary",
 						}
-						for _, namespace := range []string{namespaceRed, namespaceBlue} {
-							By("Creating namespace " + namespace)
-							_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
-								ObjectMeta: metav1.ObjectMeta{
-									Name: namespace,
-								},
-							}, metav1.CreateOptions{})
-							Expect(err).NotTo(HaveOccurred())
-							defer func() {
-								Expect(cs.CoreV1().Namespaces().Delete(
-									context.Background(),
-									namespace,
-									metav1.DeleteOptions{},
-								)).To(Succeed())
-							}()
-						}
-						networkNamespaceMap := map[string]string{namespaceRed: red, namespaceBlue: blue}
+						networkNamespaceMap := map[string]string{namespaceRed.Name: red, namespaceBlue.Name: blue}
 						for namespace, network := range networkNamespaceMap {
 							By("creating the network " + network + " in namespace " + namespace)
 							netConfig.namespace = namespace
@@ -481,7 +466,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
 
 						By("Deleting pods in network blue except " + fmt.Sprintf("%s-pod-%d", blue, numberOfPods-1))
 						for i := 0; i < numberOfPods-1; i++ {
-							err := cs.CoreV1().Pods(namespaceBlue).Delete(
+							err := cs.CoreV1().Pods(namespaceBlue.Name).Delete(
 								context.Background(),
 								fmt.Sprintf("%s-pod-%d", blue, i),
 								metav1.DeleteOptions{},
@@ -491,9 +476,9 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
 
 						podIP, err := podIPsForUserDefinedPrimaryNetwork(
 							cs,
-							namespaceBlue,
+							namespaceBlue.Name,
 							fmt.Sprintf("%s-pod-%d", blue, numberOfPods-1),
-							namespacedName(namespaceBlue, blue),
+							namespacedName(namespaceBlue.Name, blue),
 							0,
 						)
 						Expect(err).NotTo(HaveOccurred())
@@ -505,7 +490,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
 								continue
 							}
 							_, err := e2ekubectl.RunKubectl(
-								namespaceBlue,
+								namespaceBlue.Name,
 								"exec",
 								fmt.Sprintf("%s-pod-%d", blue, numberOfPods-1),
 								"--",