diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 7c7e4df..2428fa1 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -3,7 +3,7 @@
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-#  - apigee-opdk-setup-component-installer
+  - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
   - apigee-component
diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index 04b50a1..12e7871 100644
--- a/components/opdk-pre-requisites.yml
+++ b/components/opdk-pre-requisites.yml
@@ -16,7 +16,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-os-limits
-#  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - apigee-pre-req
   - apigee-tuning
@@ -24,6 +23,7 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-openjdk
   tags:
   - apigee-pre-req
@@ -34,6 +34,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-bootstrap
   tags:
   - apigee-pre-req
@@ -44,9 +45,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - 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:
   - apigee-pre-req
-  - apigee-installer
+  - apigee-config
diff --git a/configuration/opdk-baas-create-org-user.yml b/configuration/opdk-baas-create-org-user.yml
index 4ec9bc6..10b3d94 100644
--- a/configuration/opdk-baas-create-org-user.yml
+++ b/configuration/opdk-baas-create-org-user.yml
@@ -3,4 +3,5 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-baas-create-org-and-user
\ No newline at end of file
diff --git a/configuration/opdk-setup-os.yml b/configuration/opdk-setup-os.yml
index b0461fe..a6cb2f3 100644
--- a/configuration/opdk-setup-os.yml
+++ b/configuration/opdk-setup-os.yml
@@ -1,4 +1,10 @@
 ---
+- hosts: planet
+  become: true
+  strategy: free
+  roles:
+  - apigee-opdk-aws-setup
+
 - hosts: '{{ hosts }}'
   become: yes
   gather_facts: no
@@ -7,9 +13,9 @@
   - name: Load credentials from file
     include_vars: '~/.apigee/credentials.yml'
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-os-minimum
   - apigee-opdk-setup-selinux-disable
   - apigee-opdk-shutdown-iptables
-  - apigee-opdk-time-sync
   - apigee-opdk-setup-os-common
 
diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
index 6404ede..754e9e4 100644
--- a/configuration/update_cache.yml
+++ b/configuration/update_cache.yml
@@ -1,11 +1,11 @@
 ---
 - hosts: planet
-
+  vars_files:
+  - ~/.apigee/credentials.yml
   pre_tasks:
   - setup:
   - ec2_facts:
     when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
   roles:
   - apigee-opdk-setup-default-settings