diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2
index a15f6418..7aacb8c3 100644
--- a/ansible/templates/crd.yml.j2
+++ b/ansible/templates/crd.yml.j2
@@ -75,9 +75,47 @@ spec:
                     - ifnotpresent
                 tower_task_resource_requirements:
                   description: Resource requirements for the task container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_web_resource_requirements:
                   description: Resource requirements for the web container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_replicas:
                   description: Number of instance replicas
diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml
index 1ecca475..65816ae2 100644
--- a/deploy/awx-operator.yaml
+++ b/deploy/awx-operator.yaml
@@ -216,9 +216,47 @@ spec:
                     - ifnotpresent
                 tower_task_resource_requirements:
                   description: Resource requirements for the task container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_web_resource_requirements:
                   description: Resource requirements for the web container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_replicas:
                   description: Number of instance replicas
diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml
index a15f6418..7aacb8c3 100644
--- a/deploy/crds/awx_v1beta1_crd.yaml
+++ b/deploy/crds/awx_v1beta1_crd.yaml
@@ -75,9 +75,47 @@ spec:
                     - ifnotpresent
                 tower_task_resource_requirements:
                   description: Resource requirements for the task container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_web_resource_requirements:
                   description: Resource requirements for the web container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_replicas:
                   description: Number of instance replicas
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 7bc13038..0ffd8adf 100644
--- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
@@ -151,12 +151,12 @@ spec:
             path: tower_garbage_collect_secrets
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:advanced
-              - urn:alm:descriptor:com.tectonic.ui:boolean
+              - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
           - displayName: Preload instance with data upon creation ?
             path: tower_create_preload_data
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:advanced
-              - urn:alm:descriptor:com.tectonic.ui:boolean
+              - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
         statusDescriptors:
           - displayName: URL
             description: Route to access the instance deployed
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 9d37d807..625c06f0 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
@@ -76,9 +76,47 @@ spec:
                     - ifnotpresent
                 tower_task_resource_requirements:
                   description: Resource requirements for the task container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_web_resource_requirements:
                   description: Resource requirements for the web container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
                   type: object
                 tower_replicas:
                   description: Number of instance replicas