diff --git a/bundle.Dockerfile b/bundle.Dockerfile
index f78084ba..17fe97cd 100644
--- a/bundle.Dockerfile
+++ b/bundle.Dockerfile
@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=awx-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.project_layout=ansible
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
-LABEL operators.operatorframework.io.metrics.project_layout=ansible
 
 COPY deploy/olm-catalog/awx-operator/manifests /manifests/
 COPY deploy/olm-catalog/awx-operator/metadata /metadata/
diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
index 3c0ef836..5755c63e 100644
--- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
@@ -13,16 +13,7 @@ metadata:
           },
           "spec": {
             "deployment_type": "awx",
-            "tower_admin_email": "test@example.com",
-            "tower_create_preload_data": true,
-            "tower_image": "quay.io/ansible/awx:18.0.0",
             "tower_ingress_type": "ingress",
-            "tower_memcached_image": "memcached:alpine",
-            "tower_postgres_image": "postgres:12",
-            "tower_postgres_pass": "awxpass",
-            "tower_postgres_storage_class": "",
-            "tower_redis_image": "redis:latest",
-            "tower_task_privileged": false,
             "tower_task_resource_requirements": {
               "requests": {
                 "cpu": "500m",
@@ -266,22 +257,23 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:fieldDependency:tower_projects_use_existing_claim:_Yes_
         - urn:alm:descriptor:io.kubernetes:PersistentVolumeClaim
-      - displayName: Tower Projects Storage Class Name
-        description: Tower Projects Storage Class Name. If not present, the default storage class will be used.
+      - description: Tower Projects Storage Class Name. If not present, the default
+          storage class will be used.
+        displayName: Tower Projects Storage Class Name
         path: tower_projects_storage_class
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:fieldDependency:tower_projects_use_existing_claim:_No_
         - urn:alm:descriptor:com.tectonic.ui:text
-      - displayName: Tower Projects Storage Size
-        description: Tower Projects Storage Size
+      - description: Tower Projects Storage Size
+        displayName: Tower Projects Storage Size
         path: tower_projects_storage_size
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:fieldDependency:tower_projects_use_existing_claim:_No_
         - urn:alm:descriptor:com.tectonic.ui:text
-      - displayName: Tower Projects Storage Access Mode
-        description: Tower Projects Storage Access Mode
+      - description: Tower Projects Storage Access Mode
+        displayName: Tower Projects Storage Access Mode
         path: tower_projects_storage_access_mode
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
@@ -476,7 +468,7 @@ spec:
                   value: awx-operator
                 - name: ANSIBLE_GATHERING
                   value: explicit
-                image: quay.io/ansible/awx-operator:0.7.0
+                image: quay.io/ansible/awx-operator:0.8.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
index df506260..00bf9aed 100644
--- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
@@ -32,30 +32,6 @@ spec:
                 description: Secret where can be found the LDAP trusted Certificate
                   Authority Bundle
                 type: string
-              tower_projects_persistence:
-                description: Whether or not the /var/lib/projects directory will be persistent
-                default: false
-                type: boolean
-              tower_projects_use_existing_claim:
-                description: Using existing PersistentVolumeClaim
-                type: string
-                enum:
-                  - _Yes_
-                  - _No_
-              tower_projects_existing_claim:
-                description: PersistentVolumeClaim to mount /var/lib/projects directory
-                type: string
-              tower_projects_storage_class:
-                description: Storage class for the /var/lib/projects PersistentVolumeClaim
-                type: string
-              tower_projects_storage_size:
-                description: Size for the /var/lib/projects PersistentVolumeClaim
-                default: 8Gi
-                type: string
-              tower_projects_storage_access_mode:
-                description: AccessMode for the /var/lib/projects PersistentVolumeClaim
-                default: ReadWriteMany
-                type: string
               tower_admin_email:
                 description: The admin user email
                 type: string
@@ -183,6 +159,31 @@ spec:
               tower_postgres_storage_class:
                 description: Storage class to use for the PostgreSQL PVC
                 type: string
+              tower_projects_existing_claim:
+                description: PersistentVolumeClaim to mount /var/lib/projects directory
+                type: string
+              tower_projects_persistence:
+                default: false
+                description: Whether or not the /var/lib/projects directory will be
+                  persistent
+                type: boolean
+              tower_projects_storage_access_mode:
+                default: ReadWriteMany
+                description: AccessMode for the /var/lib/projects PersistentVolumeClaim
+                type: string
+              tower_projects_storage_class:
+                description: Storage class for the /var/lib/projects PersistentVolumeClaim
+                type: string
+              tower_projects_storage_size:
+                default: 8Gi
+                description: Size for the /var/lib/projects PersistentVolumeClaim
+                type: string
+              tower_projects_use_existing_claim:
+                description: Using existing PersistentVolumeClaim
+                enum:
+                - _Yes_
+                - _No_
+                type: string
               tower_redis_image:
                 description: Registry path to the redis container to use
                 type: string