diff --git a/installations/dc1/components/opdk-setup-postgres-common.yml b/installations/dc1/components/opdk-setup-postgres-common.yml
index 49e3c61..c93b45f 100644
--- a/installations/dc1/components/opdk-setup-postgres-common.yml
+++ b/installations/dc1/components/opdk-setup-postgres-common.yml
@@ -2,18 +2,15 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
+  - opdk-enable-swap
   - opdk-setup-apigee-user
+  - opdk-setup-os-postgres
   - opdk-setup-postgres-config
-  tags:
-  - os-pg
-  - os
 
-- include: ../components/opdk-install-component.yml
+- include: opdk-install-component.yml
   vars:
     hosts: '{{ hosts }}'
     component_profile: 'ps'
-  tags:
-  - pg
 
 - include: 'opdk-setup-postgres-{{ pg_component }}.yml'
   when: pg_component is defined
@@ -29,6 +26,3 @@
       username: '{{ opdk_user_email }}'
       password: '{{ opdk_user_pass }}'
     ignore_errors: yes
-  tags:
-  - pg
-  - pgmaster
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index bb4f7b7..0c66452 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -33,8 +33,8 @@
     jdk_version: '1.8'
   tags:
   - ms
-
 - include: configuration/opdk-set-reachable.yml
+
   vars:
     hosts: 'dc-1-rmp'
     reachability: 'false'
diff --git a/installations/dc2/components/opdk-setup-postgres-common.yml b/installations/dc2/components/opdk-setup-postgres-common.yml
index 4846bf1..c93b45f 100644
--- a/installations/dc2/components/opdk-setup-postgres-common.yml
+++ b/installations/dc2/components/opdk-setup-postgres-common.yml
@@ -2,6 +2,7 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
+  - opdk-enable-swap
   - opdk-setup-apigee-user
   - opdk-setup-os-postgres
   - opdk-setup-postgres-config
diff --git a/installations/dc2/configuration/opdk-setup-os.yml b/installations/dc2/configuration/opdk-setup-os.yml
index 5b148a7..f287a81 100644
--- a/installations/dc2/configuration/opdk-setup-os.yml
+++ b/installations/dc2/configuration/opdk-setup-os.yml
@@ -10,6 +10,7 @@
   - opdk-setup-os-minimum
   - opdk-setup-selinux-disable
   - opdk-shutdown-iptables
+  - opdk-enable-swap
   - opdk-time-sync
   - opdk-setup-os-common
 
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index 0862774..df0d166 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -70,7 +70,7 @@
 
 - include: configuration/opdk-set-reachable.yml
   vars:
-    hosts: 'dc-1-rmp'
+    hosts: 'dc-2-rmp'
     reachability: 'false'
   tags:
   - rmp