diff --git a/deploy/crds/tower_v1alpha1_tower_cr.yaml b/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml
similarity index 59%
rename from deploy/crds/tower_v1alpha1_tower_cr.yaml
rename to deploy/crds/tower_v1alpha1_tower_cr_awx.yaml
index 50dcf5ab..e09e3a52 100644
--- a/deploy/crds/tower_v1alpha1_tower_cr.yaml
+++ b/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml
@@ -11,13 +11,8 @@ spec:
   tower_admin_email: test@example.com
   tower_admin_password: changeme
 
-  # Use these for Ansible Tower.
-  tower_task_image: registry.access.redhat.com/ansible-tower-35/ansible-tower:3.5.3
-  tower_web_image: registry.access.redhat.com/ansible-tower-35/ansible-tower:3.5.3
-
-  # Use these for Ansible AWX.
-  # tower_task_image: ansible/awx_task:9.0.1
-  # tower_web_image: ansible/awx_web:9.0.1
+  tower_task_image: ansible/awx_task:9.0.1
+  tower_web_image: ansible/awx_web:9.0.1
 
   tower_memcached_image: memcached:alpine
 
diff --git a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml
new file mode 100644
index 00000000..3320a073
--- /dev/null
+++ b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml
@@ -0,0 +1,23 @@
+apiVersion: tower.ansible.com/v1alpha1
+kind: Tower
+metadata:
+  name: example-tower
+  namespace: example-tower
+spec:
+  tower_hostname: example-tower.test
+  tower_secret_key: aabbcc
+
+  tower_admin_user: test
+  tower_admin_email: test@example.com
+  tower_admin_password: changeme
+
+  tower_task_image: registry.access.redhat.com/ansible-tower-36/ansible-tower:3.6.0
+  tower_web_image: registry.access.redhat.com/ansible-tower-36/ansible-tower:3.6.0
+
+  tower_memcached_image: memcached:alpine
+
+  tower_rabbitmq_image: rabbitmq:3
+
+  tower_postgres_pass: awxpass
+  tower_postgres_image: postgres:9.6
+  tower_postgres_storage_request: 8Gi
diff --git a/molecule/test-local/playbook.yml b/molecule/test-local/playbook.yml
index 51367183..bd13d1d9 100644
--- a/molecule/test-local/playbook.yml
+++ b/molecule/test-local/playbook.yml
@@ -26,7 +26,7 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     pull_policy: Never
     operator_image: tower.ansible.com/tower-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr.yaml'])) | from_yaml }}"
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
 
   tasks:
 
diff --git a/molecule/test-minikube/playbook.yml b/molecule/test-minikube/playbook.yml
index 38b88f55..b648f05c 100644
--- a/molecule/test-minikube/playbook.yml
+++ b/molecule/test-minikube/playbook.yml
@@ -34,7 +34,7 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     pull_policy: Never
     operator_image: tower.ansible.com/tower-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr.yaml'])) | from_yaml }}"
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
 
   tasks:
     - block: