diff --git a/deploy/role.yaml b/deploy/role.yaml
index 9c4717ab..199452f5 100644
--- a/deploy/role.yaml
+++ b/deploy/role.yaml
@@ -1,25 +1,4 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: vitess-operator-backup-storage
-  namespace: example
-rules:
-- apiGroups:
-  - planetscale.com
-  resources:
-  - vitessshards
-  - vitessshards/status
-  - vitessshards/finalizers
-  - vitessbackups
-  - vitessbackups/status
-  - vitessbackups/finalizers
-  - vitessbackupstorages
-  - vitessbackupstorages/status
-  - vitessbackupstorages/finalizers
-  verbs:
-  - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: vitess-operator
diff --git a/deploy/role_binding.yaml b/deploy/role_binding.yaml
index 6d2297d9..132d5da3 100644
--- a/deploy/role_binding.yaml
+++ b/deploy/role_binding.yaml
@@ -1,17 +1,3 @@
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: vitess-operator-backup-storage
-  namespace: example
-subjects:
-  - kind: ServiceAccount
-    name: vitess-operator
-    namespace: example
-roleRef:
-  kind: Role
-  name: vitess-operator-backup-storage
-  apiGroup: rbac.authorization.k8s.io
----
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/deploy/service_account.yaml b/deploy/service_account.yaml
index 431b357b..e2c0d821 100644
--- a/deploy/service_account.yaml
+++ b/deploy/service_account.yaml
@@ -2,9 +2,3 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: vitess-operator
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vitess-operator
-  namespace: example
\ No newline at end of file
diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml
index d637a796..1d7c5075 100644
--- a/test/endtoend/operator/101_initial_cluster_backup.yaml
+++ b/test/endtoend/operator/101_initial_cluster_backup.yaml
@@ -225,3 +225,44 @@ spec:
   resources:
     requests:
       storage: 1Gi
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: vitess-operator
+  namespace: example
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: vitess-operator-backup-storage
+  namespace: example
+rules:
+  - apiGroups:
+      - planetscale.com
+    resources:
+      - vitessshards
+      - vitessshards/status
+      - vitessshards/finalizers
+      - vitessbackups
+      - vitessbackups/status
+      - vitessbackups/finalizers
+      - vitessbackupstorages
+      - vitessbackupstorages/status
+      - vitessbackupstorages/finalizers
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: vitess-operator-backup-storage
+  namespace: example
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: vitess-operator-backup-storage
+subjects:
+  - kind: ServiceAccount
+    name: vitess-operator
+    namespace: example
diff --git a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
index 57425c08..4ec4609b 100644
--- a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
+++ b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
@@ -256,3 +256,44 @@ spec:
   resources:
     requests:
       storage: 1Gi
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: vitess-operator
+  namespace: example
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: vitess-operator-backup-storage
+  namespace: example
+rules:
+  - apiGroups:
+      - planetscale.com
+    resources:
+      - vitessshards
+      - vitessshards/status
+      - vitessshards/finalizers
+      - vitessbackups
+      - vitessbackups/status
+      - vitessbackups/finalizers
+      - vitessbackupstorages
+      - vitessbackupstorages/status
+      - vitessbackupstorages/finalizers
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: vitess-operator-backup-storage
+  namespace: example
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: vitess-operator-backup-storage
+subjects:
+  - kind: ServiceAccount
+    name: vitess-operator
+    namespace: example
diff --git a/test/endtoend/operator/operator-latest.yaml b/test/endtoend/operator/operator-latest.yaml
index a7d6a408..22f9dfc5 100644
--- a/test/endtoend/operator/operator-latest.yaml
+++ b/test/endtoend/operator/operator-latest.yaml
@@ -7622,37 +7622,10 @@ spec:
 ---
 apiVersion: v1
 kind: ServiceAccount
-metadata:
-  name: vitess-operator
-  namespace: example
----
-apiVersion: v1
-kind: ServiceAccount
 metadata:
   name: vitess-operator
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: vitess-operator-backup-storage
-  namespace: example
-rules:
-  - apiGroups:
-      - planetscale.com
-    resources:
-      - vitessshards
-      - vitessshards/status
-      - vitessshards/finalizers
-      - vitessbackups
-      - vitessbackups/status
-      - vitessbackups/finalizers
-      - vitessbackupstorages
-      - vitessbackupstorages/status
-      - vitessbackupstorages/finalizers
-    verbs:
-      - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: vitess-operator
@@ -7741,20 +7714,6 @@ rules:
       - '*'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: vitess-operator-backup-storage
-  namespace: example
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: vitess-operator-backup-storage
-subjects:
-  - kind: ServiceAccount
-    name: vitess-operator
-    namespace: example
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: vitess-operator