diff --git a/tasks/devportal_postgres.yml b/tasks/devportal_postgres.yml
new file mode 100644
index 0000000..eb77efa
--- /dev/null
+++ b/tasks/devportal_postgres.yml
@@ -0,0 +1,24 @@
+---
+- block:
+  - name: Obtain Devportal pgmaster IP , if not provided
+    set_fact:
+      db_pgmaster_ip: "{{ hostvars[groups['dp-db-pgmaster'][0]][interface_name].ipv4.address }}"
+    when: db_pgmaster_ip is not defined and groups['dp-db-pgmaster'] is defined
+
+  - name: Obtain Devportal pgstandby IP, if not provided
+    set_fact:
+      db_pgstandby_ip: "{{ hostvars[groups['dp-db-pgstandby'][0]][interface_name].ipv4.address }}"
+    when: pgstandby_ip is not defined and groups['dc-2-pgstandby'] is defined
+
+  - name: Set pgmaster_ip for DC 2, in cache, if defined
+    cache:
+      key: db_pgmaster_ip
+      value: '{{ db_pgmaster_ip }}'
+    when: db_pgmaster_ip is defined
+
+  - name: Set pgstandby_ip for DC 2, in cache, if defined
+    cache:
+      key: db_pgstandby_ip
+      value: '{{ db_pgstandby_ip }}'
+    when: db_pgstandby_ip is defined
+  when: groups['dp-db-pgmaster'] is defined or groups['dp-db-pgstandby'] is defined
diff --git a/tasks/main.yml b/tasks/main.yml
index cc28c92..d548c07 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,4 +19,4 @@
 
 - include_tasks: postgres.yml
 
-
+- include_tasks: devportal_postgres.yml
diff --git a/tasks/postgres.yml b/tasks/postgres.yml
index 70307b5..a655471 100644
--- a/tasks/postgres.yml
+++ b/tasks/postgres.yml
@@ -1,6 +1,5 @@
 ---
 - block:
-
   - name: Obtain pgmaster IP for DC 2, if not provided
     set_fact:
       pgmaster_ip: "{{ hostvars[groups['dc-2-pgmaster'][0]][interface_name].ipv4.address }}"
@@ -22,7 +21,6 @@
       key: pgstandby_ip
       value: '{{ pgstandby_ip }}'
     when: pgstandby_ip is defined
-
   when: (groups['dc-2-pgmaster'] is defined or groups['dc-2-pgstandby'] is defined) and inventory_hostname in groups['dc-2']
 
 - block: