diff --git a/library/common-test/ci/cnpg-multi-values.yaml b/library/common-test/ci/cnpg-multi-values.yaml
index b9a603d0..63112c0c 100644
--- a/library/common-test/ci/cnpg-multi-values.yaml
+++ b/library/common-test/ci/cnpg-multi-values.yaml
@@ -44,13 +44,13 @@ cnpg:
     # - supervised: requires manual supervision to perform
     #               the switchover of the primary
     primaryUpdateStrategy: unsupervised
-    # -- enable to create extra pgbouncer for readonly access
-    acceptRO: false
     # -- storage size for the two pvc's per instance
     storage:
       size: "256Gi"
       walsize: "256Gi"
     pooler:
+      # -- enable to create extra pgbouncer for readonly access
+      createRO: false
       instances: 2
     # -- set to enable prometheus metrics
     monitoring:
@@ -72,13 +72,13 @@ cnpg:
     # - supervised: requires manual supervision to perform
     #               the switchover of the primary
     primaryUpdateStrategy: unsupervised
-    # -- enable to create extra pgbouncer for readonly access
-    acceptRO: true
     # -- storage size for the two pvc's per instance
     storage:
       size: "256Gi"
       walsize: "256Gi"
     pooler:
+      # -- enable to create extra pgbouncer for readonly access
+      createRO: true
       instances: 2
     # -- set to enable prometheus metrics
     monitoring:
@@ -100,13 +100,13 @@ cnpg:
     # - supervised: requires manual supervision to perform
     #               the switchover of the primary
     primaryUpdateStrategy: unsupervised
-    # -- enable to create extra pgbouncer for readonly access
-    acceptRO: true
     # -- storage size for the two pvc's per instance
     storage:
       size: "256Gi"
       walsize: "256Gi"
     pooler:
+      # -- enable to create extra pgbouncer for readonly access
+      createRO: true
       instances: 2
     # -- set to enable prometheus metrics
     monitoring:
diff --git a/library/common-test/ci/cnpg-values.yaml b/library/common-test/ci/cnpg-values.yaml
index 90f597c1..82099537 100644
--- a/library/common-test/ci/cnpg-values.yaml
+++ b/library/common-test/ci/cnpg-values.yaml
@@ -44,13 +44,13 @@ cnpg:
     # - supervised: requires manual supervision to perform
     #               the switchover of the primary
     primaryUpdateStrategy: unsupervised
-    # -- enable to create extra pgbouncer for readonly access
-    acceptRO: false
     # -- storage size for the two pvc's per instance
     storage:
       size: "256Gi"
       walsize: "256Gi"
     pooler:
+      # -- enable to create extra pgbouncer for readonly access
+      createRO: false
       instances: 2
     # -- set to enable prometheus metrics
     monitoring:
diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index 5e195515..deac3b0a 100644
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 17.2.25
+version: 17.2.26
diff --git a/library/common/templates/lib/dependencies/_dbWait.tpl b/library/common/templates/lib/dependencies/_dbWait.tpl
index 4db93799..a2e0917b 100644
--- a/library/common/templates/lib/dependencies/_dbWait.tpl
+++ b/library/common/templates/lib/dependencies/_dbWait.tpl
@@ -372,7 +372,7 @@ command:
       pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-rw
       do sleep 5
     done
-    {{ if $cnpg.acceptRO }}
+    {{ if and $cnpg.pooler $cnpg.pooler.createRO }}
     echo "Detected RO pooler, testing RO pooler availability..."
     until
       echo "Testing database on url:  {{ $cnpgName }}-pooler-ro"