diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index 2e62c9e..a3ce6d2 100644
--- a/components/opdk-pre-requisites.yml
+++ b/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
diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index ba5f1b3..7808b58 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -27,4 +27,4 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: apigee-opdk-server-self, server_type: 'ps'}
+  - { role: apigee-opdk-server-self, server_types: ['ps'] }
diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
index 84f2607..863312b 100644
--- a/components/opdk-setup-postgresql-add.yml
+++ b/components/opdk-setup-postgresql-add.yml
@@ -3,6 +3,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: apigee-opdk-server-self, server_type: 'ps'}
+  - { role: apigee-opdk-server-self, server_types: ['ps'] }
   - apigee-opdk-setup-postgresql-add
 
diff --git a/components/opdk-setup-qpid-add.yml b/components/opdk-setup-qpid-add.yml
index 6a6ffca..ffb5114 100644
--- a/components/opdk-setup-qpid-add.yml
+++ b/components/opdk-setup-qpid-add.yml
@@ -3,6 +3,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: apigee-opdk-server-self, server_type: 'qs'}
+  - { role: apigee-opdk-server-self, server_types: ['qs'] }
   - apigee-opdk-setup-qpid-add
 
diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index 0a5eb9d..04ac5e8 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -4,7 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
-  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_types: ['router','mp'] }
   tags:
   - reachability
\ No newline at end of file
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index 93fcd4d..be0b80c 100644
--- a/validations/opdk-setup-log-files.yml
+++ b/validations/opdk-setup-log-files.yml
@@ -3,7 +3,6 @@
   become: true
   strategy: free
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}/{{ hosts }}/' }
   tags:
   - logs
@@ -14,7 +13,6 @@
   strategy: free
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}/{{ hosts }}/' }
   tags:
   - logs
   - apigee-logs
@@ -24,7 +22,6 @@
   strategy: free
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}/{{ hosts }}/' }
   tags:
   - logs
   - config-logs