diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index 7015614..3a68d3e 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -22,10 +22,4 @@
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain server self report
-    opdk_server_self:
-      server_type: 'ps'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-    ignore_errors: yes
+  - { role: apigee-opdk-server-self, server_type: 'ps'}
diff --git a/installation.yml b/installation.yml
index b5fc75c..af7f40d 100644
--- a/installation.yml
+++ b/installation.yml
@@ -87,13 +87,6 @@
   tags:
   - ms
 
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'false'
-  tags:
-  - rmp
-
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-2-rmp'
@@ -104,13 +97,6 @@
 
 - include: configuration/opdk-set-reachable.yml
   vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'true'
-  tags:
-  - rmp
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
     hosts: 'dc-1-rmp'
     reachability: 'false'
   tags:
@@ -154,15 +140,6 @@
   tags:
   - pgmaster
 
-- include: components/opdk-setup-postgresql-add.yml
-  vars:
-    hosts: 'dc-2-pgmaster'
-    pgmaster_group_name: 'dc-2-pgmaster'
-    pgstandby_group_name: 'dc-2-pgstandby'
-  tags:
-  - pgmaster
-  - pgmaster-add
-
 - include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgstandby'
@@ -173,12 +150,12 @@
 
 - include: components/opdk-setup-postgresql-add.yml
   vars:
-    hosts: 'dc-2-pgstandby'
+    hosts: 'dc-2-pgmaster'
     pgmaster_group_name: 'dc-2-pgmaster'
     pgstandby_group_name: 'dc-2-pgstandby'
   tags:
-  - pgstandby
-  - pgstandby-add
+  - pgmaster
+  - pgmaster-add
 
 - include: configuration/opdk-setup-org-config.yml
   vars: