diff --git a/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml b/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml
index 1644dc204e..fdba258c72 100644
--- a/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml
+++ b/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml
@@ -18,6 +18,9 @@ spec:
         app: olm-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
+      {{- if and .Values.installType (eq .Values.installType "ocp") }}
+      priorityClassName: "system-cluster-critical"
+      {{- end }}
       containers:
         - name: olm-operator
           command:
@@ -47,9 +50,6 @@ spec:
           {{- end }}
           image: {{ .Values.olm.image.ref }}
           imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
-          {{- if and .Values.installType (eq .Values.installType "ocp") }}
-          priorityClassName: "system-cluster-critical"
-          {{- end }}
           ports:
             - containerPort: {{ .Values.olm.service.internalPort }}
             - containerPort: 8081
diff --git a/deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml b/deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml
index 5936fa9a96..4cf9fcd373 100644
--- a/deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml
+++ b/deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -18,6 +18,9 @@ spec:
         app: catalog-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
+      {{- if and .Values.installType (eq .Values.installType "ocp") }}
+      priorityClassName: "system-cluster-critical"
+      {{- end }}
       containers:
         - name: catalog-operator
           command:
@@ -49,9 +52,6 @@ spec:
           {{- end }}
           image: {{ .Values.catalog.image.ref }}
           imagePullPolicy: {{ .Values.catalog.image.pullPolicy }}
-          {{- if and .Values.installType (eq .Values.installType "ocp") }}
-          priorityClassName: "system-cluster-critical"
-          {{- end }}
           ports:
             - containerPort: {{ .Values.catalog.service.internalPort }}
             - containerPort: 8081
diff --git a/deploy/chart/templates/_packageserver.deployment-spec.yaml b/deploy/chart/templates/_packageserver.deployment-spec.yaml
index 6ad714f38f..f029bcfdc8 100644
--- a/deploy/chart/templates/_packageserver.deployment-spec.yaml
+++ b/deploy/chart/templates/_packageserver.deployment-spec.yaml
@@ -12,6 +12,9 @@ spec:
         app: packageserver
     spec:
       serviceAccountName: packageserver
+      {{- if and .Values.installType (eq .Values.installType "ocp") }}
+      priorityClassName: "system-cluster-critical"
+      {{- end }}
       {{- if .Values.package.nodeSelector }}
       nodeSelector:
         {{- toYaml .Values.package.nodeSelector | nindent 8 }}
@@ -41,9 +44,6 @@ spec:
         {{- end }}
         image: {{ .Values.package.image.ref }}
         imagePullPolicy: {{ .Values.package.image.pullPolicy }}
-        {{- if and .Values.installType (eq .Values.installType "ocp") }}
-        priorityClassName: "system-cluster-critical"
-        {{- end }}
         ports:
         - containerPort: {{ .Values.package.service.internalPort }}
         livenessProbe:
diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
index 24d5813ff9..4393191fb9 100644
--- a/manifests/0000_50_olm_07-olm-operator.deployment.yaml
+++ b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
@@ -18,6 +18,7 @@ spec:
         app: olm-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
+      priorityClassName: "system-cluster-critical"
       containers:
         - name: olm-operator
           command:
@@ -31,7 +32,6 @@ spec:
           - /var/run/secrets/serving-cert/tls.key
           image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
           imagePullPolicy: IfNotPresent
-          priorityClassName: "system-cluster-critical"
           ports:
             - containerPort: 8080
             - containerPort: 8081
diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
index 103f73f06c..8d00904a1c 100644
--- a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
+++ b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -18,6 +18,7 @@ spec:
         app: catalog-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
+      priorityClassName: "system-cluster-critical"
       containers:
         - name: catalog-operator
           command:
@@ -34,7 +35,6 @@ spec:
           - /var/run/secrets/serving-cert/tls.key
           image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
           imagePullPolicy: IfNotPresent
-          priorityClassName: "system-cluster-critical"
           ports:
             - containerPort: 8080
             - containerPort: 8081
diff --git a/manifests/0000_50_olm_11-olm-operators.configmap.yaml b/manifests/0000_50_olm_11-olm-operators.configmap.yaml
index 1e8f301494..ef1a0a6f5b 100644
--- a/manifests/0000_50_olm_11-olm-operators.configmap.yaml
+++ b/manifests/0000_50_olm_11-olm-operators.configmap.yaml
@@ -84,6 +84,7 @@ data:
                       app: packageserver
                   spec:
                     serviceAccountName: packageserver
+                    priorityClassName: "system-cluster-critical"
                     nodeSelector:
                       beta.kubernetes.io/os: linux
                       node-role.kubernetes.io/master: ""
@@ -102,7 +103,6 @@ data:
                       - openshift-operator-lifecycle-manager
                       image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
                       imagePullPolicy: IfNotPresent
-                      priorityClassName: "system-cluster-critical"
                       ports:
                       - containerPort: 5443
                       livenessProbe:
@@ -131,4 +131,4 @@ data:
     - packageName: packageserver
       channels:
       - name: alpha
-        currentCSV: packageserver.v0.9.0
\ No newline at end of file
+        currentCSV: packageserver.v0.9.0
diff --git a/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml b/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml
index 2dcfee2b2c..c2d8fed570 100644
--- a/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml
+++ b/manifests/0000_50_olm_16-packageserver.clusterserviceversion.yaml
@@ -76,6 +76,7 @@ spec:
                 app: packageserver
             spec:
               serviceAccountName: packageserver
+              priorityClassName: "system-cluster-critical"
               nodeSelector:
                 beta.kubernetes.io/os: linux
                 node-role.kubernetes.io/master: ""
@@ -94,7 +95,6 @@ spec:
                 - openshift-operator-lifecycle-manager
                 image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
                 imagePullPolicy: IfNotPresent
-                priorityClassName: "system-cluster-critical"
                 ports:
                 - containerPort: 5443
                 livenessProbe:
diff --git a/manifests/0000_50_olm_17-packageserver.deployment.yaml b/manifests/0000_50_olm_17-packageserver.deployment.yaml
index 1be72eb227..fc78c2adb0 100644
--- a/manifests/0000_50_olm_17-packageserver.deployment.yaml
+++ b/manifests/0000_50_olm_17-packageserver.deployment.yaml
@@ -18,6 +18,7 @@ spec:
         app: packageserver
     spec:
       serviceAccountName: packageserver
+      priorityClassName: "system-cluster-critical"
       nodeSelector:
         beta.kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""
@@ -36,7 +37,6 @@ spec:
         - openshift-operator-lifecycle-manager
         image: quay.io/operator-framework/olm@sha256:7e4b13b89b3d59876b228697bbd0c9e364fd73f946ab90308c34fd82053a5a76
         imagePullPolicy: IfNotPresent
-        priorityClassName: "system-cluster-critical"
         ports:
         - containerPort: 5443
         livenessProbe: