diff --git a/controller.yml b/controller.yml
index ea9312b..b937eb5 100644
--- a/controller.yml
+++ b/controller.yml
@@ -1,4 +1,5 @@
 ---
+# override these in job template extra vars if needed
 apd_ee_image_version: '24'
 apd_ee_image: quay.io/ansible-product-demos/apd-ee-{{ apd_ee_image_version }}:latest
 apd_git_repo: https://github.com/ansible/product-demos
@@ -8,10 +9,6 @@ apd_verify_ssl: false
 controller_validate_certs: false
 controller_configuration_async_delay: 3
 
-controller_settings:
-  - name: AWX_COLLECTIONS_ENABLED
-    value: false
-
 controller_credentials:
   - name: Automation Hub
     organization: Default
@@ -24,10 +21,12 @@ controller_credentials:
   - name: Controller Credential
     organization: Default
     credential_type: Red Hat Ansible Automation Platform
+    update_secrets: false
+    state: exists
     inputs:
-      host: https://{{ groups.automationcontroller[0] }}
+      host: https://{{ groups.automationcontroller[0] | default('REPLACEME') }}
       username: admin
-      password: '{{ controller_admin_password }}'
+      password: '{{ controller_admin_password | default("REPLACEME") }}'
       verify_ssl: '{{ apd_verify_ssl }}'
 
 controller_execution_environments:
@@ -56,6 +55,7 @@ controller_templates:
     project: Ansible Product Demos
     playbook: setup_demo.yml
     credentials: Controller Credential
+    execution_environment: Product Demos EE
     allow_simultaneous: true
     survey_enabled: true
     survey_spec:
@@ -79,6 +79,7 @@ controller_templates:
     playbook: multi_select_setup.yml
     inventory: Demo Inventory
     credentials: Controller Credential
+    execution_environment: Product Demos EE
     survey_enabled: true
     survey:
       name: ''