diff --git a/cmd/main.go b/cmd/main.go
index 7ef930681..f8215ab54 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -27,7 +27,7 @@ func init() {
 	flag.BoolVar(&config.NoTeamsAPI, "noteamsapi", false, "Disable all access to the teams API")
 	flag.Parse()
 
-	config.Namespace = os.Getenv("MY_POD_NAMESPACE")
+	config.Namespace = os.Getenv("WATCH_NAMESPACE")
 	if config.Namespace == "" {
 		config.Namespace = "default"
 	}
diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml
index 93f97d916..f9db500c2 100644
--- a/manifests/postgres-operator.yaml
+++ b/manifests/postgres-operator.yaml
@@ -15,7 +15,7 @@ spec:
         image: pierone.example.com/acid/postgres-operator:0.1
         imagePullPolicy: IfNotPresent
         env:
-        - name: MY_POD_NAMESPACE
+        - name: WATCH_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace