diff --git a/tasks/devportal_postgres.yml b/tasks/devportal_postgres.yml
index 6cf1367..359b1c4 100644
--- a/tasks/devportal_postgres.yml
+++ b/tasks/devportal_postgres.yml
@@ -1,24 +1,15 @@
 ---
 - block:
   - name: Obtain Devportal pgmaster IP from inventory
-    set_fact:
-      db_pgmaster_ip: "{{ hostvars[groups['dp-db-pgmaster'][0]][interface_name].ipv4.address }}"
+    cache:
+      key: db_pgmaster_ip
+      value: "{{ 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 from inventory
-    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 db_pgmaster_ip from inventory in cache
-    cache:
-      key: db_pgmaster_ip
-      value: '{{ db_pgmaster_ip }}'
-    when: db_pgmaster_ip is defined
-
-  - name: Set db_pgstandby_ip from inventory in cache
     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
+      value: "{{ hostvars[groups['dp-db-pgstandby'][0]][interface_name].ipv4.address }}"
+    when: db_pgstandby_ip is not defined and groups['dp-db-pgstandby'] is defined
+
+  when: groups['dp-db-pgmaster'] is defined and groups['dp-db-pgstandby'] is defined