diff --git a/components/opdk-setup-qpid-add.yml b/components/opdk-setup-qpid-add.yml
new file mode 100644
index 0000000..3cfd5ae
--- /dev/null
+++ b/components/opdk-setup-qpid-add.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+  - { role: apigee-opdk-server-self, server_type: 'qs'}
+
diff --git a/installation.yml b/installation.yml
index fe97cf9..3abfba7 100644
--- a/installation.yml
+++ b/installation.yml
@@ -271,6 +271,13 @@
   - dc-2-qpid
   - dc-2
 
+- include: components/opdk-setup-qpid-add.yml
+  vars:
+    hosts: 'dc-2-qpid'
+  tags:
+  - dc-2-qpid
+  - dc-2
+
 - include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgmaster'
diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index c95adcf..0e74e6f 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -3,66 +3,23 @@
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain router server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'router'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-  - debug: var="edge_router_self"
-
-  - name: Obtain message processor server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'mp'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_mp_self"
-
+  - { role: apigee-opdk-server-self, server_type: 'router'}
+  - { role: apigee-opdk-server-self, server_type: 'mp'}
 
 - hosts: pg
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain postgres server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'ps'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_ps_self"
-
+  - { role: apigee-opdk-server-self, server_type: 'ps'}
 
 - hosts: qpid
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain qpid server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'qs'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_qs_self"
-
+  - { role: apigee-opdk-server-self, server_type: 'qs'}
 
 - hosts: ms
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain management server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'ms'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_ms_self"
-
+  - { role: apigee-opdk-server-self, server_type: 'ms'}