diff --git a/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
index a6615174bc..8053d2b59f 100644
--- a/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
+++ b/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
@@ -12,9 +12,6 @@ metadata:
     olm.version: 0.17.0
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
 spec:
-  cleanup:
-    enabled: false
-  customresourcedefinitions: {}
   displayName: Package Server
   description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
   minKubeVersion: 1.11.0
@@ -24,6 +21,9 @@ spec:
       email: openshift-operators@redhat.com
   provider:
     name: Red Hat
+  cleanup:
+    enabled: false
+  customresourcedefinitions: {}
   links:
     - name: Package Server
       url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
@@ -88,9 +88,9 @@ spec:
               metadata:
                 annotations:
                   target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-                creationTimestamp: null
                 labels:
                   app: packageserver
+                creationTimestamp: null
               spec:
                 serviceAccountName: olm-operator-serviceaccount
                 priorityClassName: "system-cluster-critical"
diff --git a/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml b/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml
index 26a02b739f..e7a894688b 100644
--- a/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml
+++ b/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml
@@ -27,6 +27,9 @@ spec:
     email: openshift-operators@redhat.com
   provider:
     name: Red Hat
+  cleanup:
+    enabled: false
+  customresourcedefinitions: {}
   links:
   - name: Package Server
     url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
diff --git a/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.deployment-spec.yaml b/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.deployment-spec.yaml
index d90a13527f..b89ba415a7 100644
--- a/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.deployment-spec.yaml
+++ b/staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.deployment-spec.yaml
@@ -17,6 +17,7 @@ spec:
       {{- end }}
       labels:
         app: packageserver
+      creationTimestamp: null
     spec:
       serviceAccountName: olm-operator-serviceaccount
       {{- if and .Values.installType (eq .Values.installType "ocp") }}
@@ -53,6 +54,7 @@ spec:
         imagePullPolicy: {{ .Values.package.image.pullPolicy }}
         ports:
         - containerPort: {{ .Values.package.service.internalPort }}
+          protocol: TCP
         livenessProbe:
           httpGet:
             scheme: HTTPS