diff --git a/aap.yml b/aap.yml
deleted file mode 100644
index c3d1dfc..0000000
--- a/aap.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-user_default_password: 'CHANGEME!'
-
-aap_organizations:
-  - name: APD - Ansible Product Demos
-    galaxy_credentials:
-      - Ansible Galaxy
-      - Automation Hub
-
-aap_teams:
-  - name: APD Admins
-    organization: Ansible Product Demos
-    state: exists
-  - name: APD Users
-    organization: Ansible Product Demos
-    state: exists
-
-aap_user_accounts:
-  - name: APD Admins
-    organization: Ansible Product Demos
-    state: exists
-
-...
diff --git a/controller.yml b/controller.yml
index 313258e..54fc56d 100644
--- a/controller.yml
+++ b/controller.yml
@@ -17,7 +17,6 @@ controller_credentials:
     inputs:
       url: https://console.redhat.com/api/automation-hub/
       auth_url: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-
   - name: APD - AAP Admin Credential
     organization: APD - Ansible Product Demos
     credential_type: Red Hat Ansible Automation Platform
@@ -29,6 +28,16 @@ controller_credentials:
       password: '{{ controller_admin_password | default("REPLACEME") }}'
       verify_ssl: '{{ apd_verify_ssl }}'
 
+controller_organizations:
+  - name: Default
+    galaxy_credentials:
+      - Ansible Galaxy
+      - Automation Hub
+  - name: APD - Ansible Product Demos
+    galaxy_credentials:
+      - Ansible Galaxy
+      - APD - Automation Hub
+
 controller_execution_environments:
   - name: Product Demos EE
     image: '{{ apd_ee_image }}'