diff --git a/testdata/images/bundles/large-crd-operator/v1.0.0/manifests/largecrdoperator.clusterserviceversion.yaml b/testdata/images/bundles/large-crd-operator/v1.0.0/manifests/largecrdoperator.clusterserviceversion.yaml
index f13a2880f2..b5528ea51a 100644
--- a/testdata/images/bundles/large-crd-operator/v1.0.0/manifests/largecrdoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/large-crd-operator/v1.0.0/manifests/largecrdoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: largecrdtest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 volumes:
                   - name: scripts
@@ -89,7 +90,6 @@ spec:
                         port: 80
                       initialDelaySeconds: 1
                       periodSeconds: 1
-                    serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/ownnamespaceoperator.clusterserviceversion.yaml b/testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/ownnamespaceoperator.clusterserviceversion.yaml
index d6c2a32550..de0af1d40a 100644
--- a/testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/ownnamespaceoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/ownnamespaceoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: ownnamespacetest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 containers:
                   - name: busybox
@@ -65,7 +66,6 @@ spec:
                     securityContext:
                       runAsUser: 1000
                       runAsNonRoot: true
-                serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/single-namespace-operator/v1.0.0/manifests/singlenamespaceoperator.clusterserviceversion.yaml b/testdata/images/bundles/single-namespace-operator/v1.0.0/manifests/singlenamespaceoperator.clusterserviceversion.yaml
index dea4c7f09c..c29519eb89 100644
--- a/testdata/images/bundles/single-namespace-operator/v1.0.0/manifests/singlenamespaceoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/single-namespace-operator/v1.0.0/manifests/singlenamespaceoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: singlenamespacetest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 containers:
                   - name: busybox
@@ -65,7 +66,6 @@ spec:
                     securityContext:
                       runAsUser: 1000
                       runAsNonRoot: true
-                serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/test-operator/v1.0.0/manifests/testoperator.clusterserviceversion.yaml b/testdata/images/bundles/test-operator/v1.0.0/manifests/testoperator.clusterserviceversion.yaml
index ae6fadca9b..d8cbae85a5 100644
--- a/testdata/images/bundles/test-operator/v1.0.0/manifests/testoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/test-operator/v1.0.0/manifests/testoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: olme2etest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 volumes:
                   - name: scripts
@@ -89,7 +90,6 @@ spec:
                         port: 80
                       initialDelaySeconds: 1
                       periodSeconds: 1
-                serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/test-operator/v1.0.2/manifests/testoperator.clusterserviceversion.yaml b/testdata/images/bundles/test-operator/v1.0.2/manifests/testoperator.clusterserviceversion.yaml
index f39fd69f5f..70c85be13c 100644
--- a/testdata/images/bundles/test-operator/v1.0.2/manifests/testoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/test-operator/v1.0.2/manifests/testoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: olme2etest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 volumes:
                   - name: scripts
@@ -65,7 +66,6 @@ spec:
                   - name: busybox-httpd-container
                     # This image ref is wrong and should trigger ImagePullBackOff condition
                     image: wrong/image
-                serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/test-operator/v1.0.3/manifests/testoperator.clusterserviceversion.yaml b/testdata/images/bundles/test-operator/v1.0.3/manifests/testoperator.clusterserviceversion.yaml
index a33f5a6c65..8414e78ae1 100644
--- a/testdata/images/bundles/test-operator/v1.0.3/manifests/testoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/test-operator/v1.0.3/manifests/testoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: olme2etest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 volumes:
                   - name: scripts
@@ -65,7 +66,6 @@ spec:
                   - name: busybox-httpd-container
                     # This image ref is wrong and should trigger ImagePullBackOff condition
                     image: busybox:1.36
-                serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups:
diff --git a/testdata/images/bundles/test-operator/v1.2.0/manifests/testoperator.clusterserviceversion.yaml b/testdata/images/bundles/test-operator/v1.2.0/manifests/testoperator.clusterserviceversion.yaml
index 6fc91adf3c..2f1aff7a59 100644
--- a/testdata/images/bundles/test-operator/v1.2.0/manifests/testoperator.clusterserviceversion.yaml
+++ b/testdata/images/bundles/test-operator/v1.2.0/manifests/testoperator.clusterserviceversion.yaml
@@ -55,6 +55,7 @@ spec:
                 labels:
                   app: olme2etest
               spec:
+                serviceAccountName: simple-bundle-manager
                 terminationGracePeriodSeconds: 0
                 volumes:
                   - name: scripts
@@ -89,7 +90,6 @@ spec:
                         port: 80
                       initialDelaySeconds: 1
                       periodSeconds: 1
-                    serviceAccountName: simple-bundle-manager
       clusterPermissions:
         - rules:
             - apiGroups: