diff --git a/components/opdk-cassandra-client-update.yml b/components/opdk-cassandra-client-update.yml
index 461ecd9..fdd5df8 100644
--- a/components/opdk-cassandra-client-update.yml
+++ b/components/opdk-cassandra-client-update.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-start-components
   - apigee-opdk-cassandra-client-update
   tags:
diff --git a/components/opdk-cassandra-rebuild.yml b/components/opdk-cassandra-rebuild.yml
index ac712e1..bfa3ded 100644
--- a/components/opdk-cassandra-rebuild.yml
+++ b/components/opdk-cassandra-rebuild.yml
@@ -3,6 +3,7 @@
   vars:
     opdk_region: dc-1
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-cassandra-rebuild
   tags:
   - c-rebuild
diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 1a14538..2428fa1 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -5,6 +5,5 @@
   - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
   - apigee-component
diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index 4be8465..7493cc4 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
@@ -45,8 +45,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-silent-installation-config
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - apigee-pre-req
   - apigee-silent-config
diff --git a/components/opdk-setup-postgres-master.yml b/components/opdk-setup-postgres-master.yml
index 1fa4f95..b473ec1 100644
--- a/components/opdk-setup-postgres-master.yml
+++ b/components/opdk-setup-postgres-master.yml
@@ -2,6 +2,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-postgres-master
   tags:
   - pgmaster
diff --git a/components/opdk-setup-postgres-standby.yml b/components/opdk-setup-postgres-standby.yml
index a8dbba2..fa8265e 100644
--- a/components/opdk-setup-postgres-standby.yml
+++ b/components/opdk-setup-postgres-standby.yml
@@ -2,6 +2,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby
diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index 0a5eb9d..4cedf06 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -4,6 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
   - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
   tags:
diff --git a/configuration/opdk-setup-org-config.yml b/configuration/opdk-setup-org-config.yml
index 6b2e672..33c4211 100644
--- a/configuration/opdk-setup-org-config.yml
+++ b/configuration/opdk-setup-org-config.yml
@@ -4,5 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-org-config
 
diff --git a/configuration/opdk-setup-org.yml b/configuration/opdk-setup-org.yml
index 002ae70..7bbba19 100644
--- a/configuration/opdk-setup-org.yml
+++ b/configuration/opdk-setup-org.yml
@@ -4,4 +4,5 @@
   - ~/.apigee/credentials.yml
   strategy: free
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-org
diff --git a/validations/opdk-setup-status.yml b/validations/opdk-setup-status.yml
index a5dff3e..c5f0a16 100644
--- a/validations/opdk-setup-status.yml
+++ b/validations/opdk-setup-status.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-status
   tags:
   - status