diff --git a/installations/baas/components/opdk-pre-requisites.yml b/installations/baas/components/opdk-pre-requisites.yml
index 9071b44..57e829d 100644
--- a/installations/baas/components/opdk-pre-requisites.yml
+++ b/installations/baas/components/opdk-pre-requisites.yml
@@ -4,7 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-apigee-user
   tags:
   - apigee-user
@@ -34,7 +33,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-bootstrap
   tags:
   - apigee-pre-req
@@ -45,7 +43,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-baas-silent-installation-config
   - apigee-opdk-setup-component-installer
 #  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
diff --git a/installations/baas/configuration/opdk-baas-create-org-user.yml b/installations/baas/configuration/opdk-baas-create-org-user.yml
index ff847b7..4ec9bc6 100644
--- a/installations/baas/configuration/opdk-baas-create-org-user.yml
+++ b/installations/baas/configuration/opdk-baas-create-org-user.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-baas-create-org-and-user
-  tags:
-  - org
\ No newline at end of file
+  - apigee-opdk-baas-create-org-and-user
\ No newline at end of file