diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml
index 3d166d0..43eeddb 100644
--- a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml
+++ b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml
@@ -37,7 +37,7 @@ spec:
       isWALArchiver: true
       parameters:
         barmanObjectName: cnpg17-objectstore-hw
-        serverName: cnpg17-cluster-hk
+        serverName: cnpg17-cluster-hk-a
 
 ---
 apiVersion: postgresql.cnpg.io/v1
diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml
index 99abaa9..4009c94 100644
--- a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml
+++ b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml
@@ -37,7 +37,7 @@ spec:
       isWALArchiver: true
       parameters:
         barmanObjectName: cnpg17-objectstore-hw
-        serverName: cnpg17-cluster-sh
+        serverName: cnpg17-cluster-sh-a
 
 ---
 apiVersion: postgresql.cnpg.io/v1