diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..77d6048
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+#
+# Syntax and details are here: https://help.github.com/articles/about-codeowners/
+#
+# Global code ownership, fallback
+*                   @pfl @tkatila
diff --git a/test/e2e/e2e_utils.go b/test/e2e/e2e_utils.go
index f3a8710..d9c5c0c 100644
--- a/test/e2e/e2e_utils.go
+++ b/test/e2e/e2e_utils.go
@@ -473,7 +473,7 @@ func getServiceClusterIP(name, ns string) string {
 
 func getControllerPodIP(ns string) string {
 	cmd := exec.Command("kubectl", "get",
-		"pods", "-l", "control-plane=controller-manager",
+		"pods", "-l", "control-plane=gpu-operator-controller-manager",
 		"-o", "go-template={{ range .items }}"+
 			"{{ if not .metadata.deletionTimestamp }}"+
 			"{{ .status.podIP }}"+