diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
index 6e45161..ce0e537 100644
--- a/components/opdk-setup-postgresql-add.yml
+++ b/components/opdk-setup-postgresql-add.yml
@@ -4,6 +4,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
-  - { 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 fc4cb5b..8f7fbd2 100644
--- a/components/opdk-setup-qpid-add.yml
+++ b/components/opdk-setup-qpid-add.yml
@@ -4,6 +4,6 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
-  - { 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..3b90536 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-server-self.yml b/validations/opdk-server-self.yml
index 0e74e6f..dce7611 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -3,23 +3,22 @@
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-server-self, server_type: 'router'}
-  - { role: apigee-opdk-server-self, server_type: 'mp'}
+  - { role: apigee-opdk-server-self, server_types: ['router','mp']}
 
 - hosts: pg
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-server-self, server_type: 'ps'}
+  - { role: apigee-opdk-server-self, server_types: ['ps']}
 
 - hosts: qpid
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-server-self, server_type: 'qs'}
+  - { role: apigee-opdk-server-self, server_types: ['qs']}
 
 - hosts: ms
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-server-self, server_type: 'ms'}
+  - { role: apigee-opdk-server-self, server_types: ['ms']}