diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
index 79b8f6b..1950686 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
@@ -36,5 +36,6 @@
   backupninja:
     client:
       target:
+        # WR PROD-20679 - set the same path for client and server
         home_dir: /srv/volumes/backup/backupninja
         engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
index 2d6d77f..8f84903 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
@@ -9,7 +9,7 @@
     xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
   backupninja:
     server:
-      home_dir: /srv/glusterfs/backup/backupninja
+      home_dir: /srv/volumes/backup/backupninja
   xtrabackup:
     server:
-      backup_dir: /srv/glusterfs/backup/xtrabackup
\ No newline at end of file
+      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 5905d47..a8e6d17 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -58,11 +58,21 @@
   salt:
     master:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-dvr.local
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
     minion:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-dvr.local
   reclass:
     storage:
       class_mapping:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
index 79b8f6b..1950686 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
@@ -36,5 +36,6 @@
   backupninja:
     client:
       target:
+        # WR PROD-20679 - set the same path for client and server
         home_dir: /srv/volumes/backup/backupninja
         engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
index 2d6d77f..8f84903 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
@@ -9,7 +9,7 @@
     xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
   backupninja:
     server:
-      home_dir: /srv/glusterfs/backup/backupninja
+      home_dir: /srv/volumes/backup/backupninja
   xtrabackup:
     server:
-      backup_dir: /srv/glusterfs/backup/xtrabackup
\ No newline at end of file
+      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 815e20f..f3d1886 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -57,11 +57,21 @@
   salt:
     master:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-ovs.local
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
     minion:
       backup: true
+      initial_data:
+        engine: backupninja
+        source: ctl03
+        home_dir: /srv/volumes/backup/backupninja
+        host: cfg01.virtual-mcp-pike-ovs.local
   reclass:
     storage:
       class_mapping: