diff --git a/host_vars/devnso-postgres02-01.yml b/host_vars/devnso-postgres02-01.yml
index a47a98a..dddd117 100644
--- a/host_vars/devnso-postgres02-01.yml
+++ b/host_vars/devnso-postgres02-01.yml
@@ -1,3 +1,5 @@
 ---
 server_type: "master"
 lvm_volume_encryption: true
+
+shared_service_postgres_secondary: "{{ stage }}-postgres02-02"
diff --git a/host_vars/devnso-postgres02-02.yml b/host_vars/devnso-postgres02-02.yml
index 4d95a12..98c5979 100644
--- a/host_vars/devnso-postgres02-02.yml
+++ b/host_vars/devnso-postgres02-02.yml
@@ -1,3 +1,5 @@
 ---
 server_type: "slave"
 lvm_volume_encryption: true
+
+shared_service_postgres_primary: "{{ stage }}-postgres02-01"
diff --git a/host_vars/prodnso-postgres02-01.yml b/host_vars/prodnso-postgres02-01.yml
index 8aabcd5..a5cc5fb 100644
--- a/host_vars/prodnso-postgres02-01.yml
+++ b/host_vars/prodnso-postgres02-01.yml
@@ -9,3 +9,5 @@ postgres_pgdatadir_lvm_hcloudvol_count: 2
 postgres_pgdatadir_lvm_hcloudvol_size: 30
 
 lvm_volume_encryption: true
+
+shared_service_postgres_secondary: "{{ stage }}-postgres02-02"
diff --git a/host_vars/prodnso-postgres02-02.yml b/host_vars/prodnso-postgres02-02.yml
index f60118c..6b6b7f6 100644
--- a/host_vars/prodnso-postgres02-02.yml
+++ b/host_vars/prodnso-postgres02-02.yml
@@ -9,3 +9,5 @@ postgres_pgdatadir_lvm_hcloudvol_count: 2
 postgres_pgdatadir_lvm_hcloudvol_size: 30
 
 lvm_volume_encryption: true
+
+shared_service_postgres_primary: "{{ stage }}-postgres02-01"
diff --git a/host_vars/qa-postgres02-01.yml b/host_vars/qa-postgres02-01.yml
index a47a98a..dddd117 100644
--- a/host_vars/qa-postgres02-01.yml
+++ b/host_vars/qa-postgres02-01.yml
@@ -1,3 +1,5 @@
 ---
 server_type: "master"
 lvm_volume_encryption: true
+
+shared_service_postgres_secondary: "{{ stage }}-postgres02-02"
diff --git a/host_vars/qa-postgres02-02.yml b/host_vars/qa-postgres02-02.yml
index 4d95a12..98c5979 100644
--- a/host_vars/qa-postgres02-02.yml
+++ b/host_vars/qa-postgres02-02.yml
@@ -1,3 +1,5 @@
 ---
 server_type: "slave"
 lvm_volume_encryption: true
+
+shared_service_postgres_primary: "{{ stage }}-postgres02-01"
diff --git a/restore-remote-database-backup.yml b/restore-remote-database-backup.yml
index 388b2a5..eb45f69 100644
--- a/restore-remote-database-backup.yml
+++ b/restore-remote-database-backup.yml
@@ -207,7 +207,7 @@
     ansible_ssh_host: "{{ stage_server_domain }}"
     database_servers: "{{ hostvars[stage + '-virtual-host-to-read-groups-vars'].database_servers }}"
   tasks:
-    - name: "Start restore test for '{{ database_engine }}' backup from server '{{ database_server }}'"
+    - name: "Start restore test for <{{ database_engine }}>"
       include_role:
         name: "restore_{{ database_engine }}"
         tasks_from: _restore_test
diff --git a/roles/postgres/tasks/slave-requirements.yml b/roles/postgres/tasks/slave-requirements.yml
index 3a171f1..326508a 100644
--- a/roles/postgres/tasks/slave-requirements.yml
+++ b/roles/postgres/tasks/slave-requirements.yml
@@ -16,17 +16,16 @@
     line: "hot_standby_feedback = on"
     path: /etc/postgresql/{{ default_postgres_version }}/main/postgresql.conf
 
-- name: Create hosts entry for master (db-master)
-  lineinfile:
-    path: /etc/hosts
-    line: "{{ shared_service_pg_master_ip }} db-master"
-    state: present
-
-- name: Create hosts entry for backups (db-backups)
-  lineinfile:
-    path: /etc/hosts
-    line: "{{ shared_service_pg_master_ip }} db-backups"
+- name: "Setting hosts configuration for for db-master and db-backups in /etc/hosts"
+  blockinfile:
+    marker: "# {mark} managed by ansible (hosts config for db-master and db-backups)"
+    path: "/etc/hosts"
+    mode: "0644"
     state: present
+    create: yes
+    block: |
+      {{ shared_service_pg_master_ip + ' ' + 'db-master' }}
+      {{ shared_service_pg_master_ip + ' ' + 'db-backup' }}
 
 - name: Wait for nfsd is up and running
   wait_for: