diff --git a/infrastructure/ontime-operator/cluster-role-binding.yaml b/infrastructure/ontime-operator/cluster-role-binding.yaml
index 297b7c3..a5aacd0 100644
--- a/infrastructure/ontime-operator/cluster-role-binding.yaml
+++ b/infrastructure/ontime-operator/cluster-role-binding.yaml
@@ -14,7 +14,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: stage-editor
-  namespace: ontime-operator-system
+  namespace: ontime-operator
 roleRef:
   kind: ClusterRole
   name: ontime-operator-stage-editor-role
@@ -27,7 +27,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: stage-editor
-  namespace: ontime-operator-system
+  namespace: ontime-operator
 roleRef:
   kind: ClusterRole
   name: edit-namespaces
diff --git a/infrastructure/ontime-operator/namespace-prefix-policy.yaml b/infrastructure/ontime-operator/namespace-prefix-policy.yaml
index a3910b7..9e034dd 100644
--- a/infrastructure/ontime-operator/namespace-prefix-policy.yaml
+++ b/infrastructure/ontime-operator/namespace-prefix-policy.yaml
@@ -12,7 +12,7 @@ spec:
       resources:   ["namespaces"]
   matchConditions:
     - name: 'only-stage-editor'
-      expression: "request.userInfo.username == 'system:serviceaccount:ontime-operator-system:stage-editor'"
+      expression: "request.userInfo.username == 'system:serviceaccount:ontime-operator:stage-editor'"
   validations:
     - expression: "object.metadata.name.startsWith('team-')"
       message: "All namespaces managed by stage-editor must start with 'team-'"
diff --git a/infrastructure/ontime-operator/service-account.yaml b/infrastructure/ontime-operator/service-account.yaml
index 7c97730..816ff02 100644
--- a/infrastructure/ontime-operator/service-account.yaml
+++ b/infrastructure/ontime-operator/service-account.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: stage-editor
-  namespace: ontime-operator-system
\ No newline at end of file
+  namespace: ontime-operator
\ No newline at end of file