diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml
index f34e2957f..5fadae356 100644
--- a/charts/postgres-operator/crds/operatorconfigurations.yaml
+++ b/charts/postgres-operator/crds/operatorconfigurations.yaml
@@ -354,7 +354,7 @@ spec:
                 connection_pool_default_memory_limit:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                  #default: "100m"
+                  #default: "100Mi"
                 connection_pool_default_memory_request:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
index 0c21ccade..5c7e47525 100644
--- a/charts/postgres-operator/values-crd.yaml
+++ b/charts/postgres-operator/values-crd.yaml
@@ -284,9 +284,9 @@ configConnectionPool:
   connection_pool_number_of_instances: 2
   # default resources
   connection_pool_default_cpu_request: "1"
-  connection_pool_default_memory_request: "100Mi"
+  connection_pool_default_memory_request: 100Mi
   connection_pool_default_cpu_limit: "1"
-  connection_pool_default_memory_limit: "100Mi"
+  connection_pool_default_memory_limit: 100Mi
 
 rbac:
   # Specifies whether RBAC resources should be created
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
index 55c9daa6a..5194d02ba 100644
--- a/charts/postgres-operator/values.yaml
+++ b/charts/postgres-operator/values.yaml
@@ -261,9 +261,9 @@ configConnectionPool:
   connection_pool_number_of_instances: 2
   # default resources
   connection_pool_default_cpu_request: "1"
-  connection_pool_default_memory_request: "100Mi"
+  connection_pool_default_memory_request: 100Mi
   connection_pool_default_cpu_limit: "1"
-  connection_pool_default_memory_limit: "100Mi"
+  connection_pool_default_memory_limit: 100Mi
 
 rbac:
   # Specifies whether RBAC resources should be created
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 3b248a4dd..6b645dbe6 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -13,8 +13,8 @@ data:
   cluster_name_label: cluster-name
   # connection_pool_default_cpu_limit: "1"
   # connection_pool_default_cpu_request: "1"
-  # connection_pool_default_memory_limit: 100m
-  # connection_pool_default_memory_request: "100Mi"
+  # connection_pool_default_memory_limit: 100Mi
+  # connection_pool_default_memory_request: 100Mi
   connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
   # connection_pool_max_db_connections: 60
   # connection_pool_mode: "transaction"
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 483d5c0cb..4b2b977db 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@@ -317,7 +317,7 @@ spec:
                   #default: "transaction"
                 connection_pool_number_of_instances:
                   type: integer
-                  minimum: 2,
+                  minimum: 2
                   #default: 2
                 connection_pool_default_cpu_limit:
                   type: string
@@ -330,7 +330,7 @@ spec:
                 connection_pool_default_memory_limit:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
-                  #default: "100m"
+                  #default: "100Mi"
                 connection_pool_default_memory_request:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index 83f5692de..065b50c27 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -124,8 +124,8 @@ configuration:
   connection_pool:
     connection_pool_default_cpu_limit: "1"
     connection_pool_default_cpu_request: "1"
-    connection_pool_default_memory_limit: 100m
-    connection_pool_default_memory_request: "100Mi"
+    connection_pool_default_memory_limit: 100Mi
+    connection_pool_default_memory_request: 100Mi
     connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
     # connection_pool_max_db_connections: 60
     connection_pool_mode: "transaction"