diff --git a/class/defaults.yml b/class/defaults.yml
index 43a90ea03..5d51066d1 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -585,14 +585,14 @@ parameters:
                 memory: "64Mi"
               limits:
                 cpu: "500m"
-                memory: "64Mi"
+                memory: "512Mi"
             pgbouncer:
               requests:
                 cpu: "16m"
                 memory: "4Mi"
               limits:
                 cpu: "500m"
-                memory: "20Mi"
+                memory: "128Mi"
             postgresUtil:
               requests:
                 cpu: "10m"
diff --git a/tests/golden/openshift/appcat/appcat/20_plans_vshn_postgresql.yaml b/tests/golden/openshift/appcat/appcat/20_plans_vshn_postgresql.yaml
index a7034c7fd..a95bc9b70 100644
--- a/tests/golden/openshift/appcat/appcat/20_plans_vshn_postgresql.yaml
+++ b/tests/golden/openshift/appcat/appcat/20_plans_vshn_postgresql.yaml
@@ -11,8 +11,8 @@ data:
   sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "256Mi"}, "requests":
     {"cpu": "32m", "memory": "128Mi"}}, "createBackup": {"limits": {"cpu": "400m",
     "memory": "500Mi"}, "requests": {"cpu": "100m", "memory": "64Mi"}}, "envoy": {"limits":
-    {"cpu": "500m", "memory": "64Mi"}, "requests": {"cpu": "32m", "memory": "64Mi"}},
-    "pgbouncer": {"limits": {"cpu": "500m", "memory": "20Mi"}, "requests": {"cpu":
+    {"cpu": "500m", "memory": "512Mi"}, "requests": {"cpu": "32m", "memory": "64Mi"}},
+    "pgbouncer": {"limits": {"cpu": "500m", "memory": "128Mi"}, "requests": {"cpu":
     "16m", "memory": "4Mi"}}, "postgresUtil": {"limits": {"cpu": "20m", "memory":
     "20Mi"}, "requests": {"cpu": "10m", "memory": "4Mi"}}, "prometheusPostgresExporter":
     {"limits": {"cpu": "150m", "memory": "256Mi"}, "requests": {"cpu": "10m", "memory":
diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml
index eb18f8621..c5df614df 100644
--- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml
+++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -84,9 +84,9 @@ spec:
           sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "256Mi"},
             "requests": {"cpu": "32m", "memory": "128Mi"}}, "createBackup": {"limits":
             {"cpu": "400m", "memory": "500Mi"}, "requests": {"cpu": "100m", "memory":
-            "64Mi"}}, "envoy": {"limits": {"cpu": "500m", "memory": "64Mi"}, "requests":
+            "64Mi"}}, "envoy": {"limits": {"cpu": "500m", "memory": "512Mi"}, "requests":
             {"cpu": "32m", "memory": "64Mi"}}, "pgbouncer": {"limits": {"cpu": "500m",
-            "memory": "20Mi"}, "requests": {"cpu": "16m", "memory": "4Mi"}}, "postgresUtil":
+            "memory": "128Mi"}, "requests": {"cpu": "16m", "memory": "4Mi"}}, "postgresUtil":
             {"limits": {"cpu": "20m", "memory": "20Mi"}, "requests": {"cpu": "10m",
             "memory": "4Mi"}}, "prometheusPostgresExporter": {"limits": {"cpu": "150m",
             "memory": "256Mi"}, "requests": {"cpu": "10m", "memory": "16Mi"}}, "runDbops":
diff --git a/tests/golden/vshn/appcat/appcat/20_plans_vshn_postgresql.yaml b/tests/golden/vshn/appcat/appcat/20_plans_vshn_postgresql.yaml
index a7034c7fd..a95bc9b70 100644
--- a/tests/golden/vshn/appcat/appcat/20_plans_vshn_postgresql.yaml
+++ b/tests/golden/vshn/appcat/appcat/20_plans_vshn_postgresql.yaml
@@ -11,8 +11,8 @@ data:
   sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "256Mi"}, "requests":
     {"cpu": "32m", "memory": "128Mi"}}, "createBackup": {"limits": {"cpu": "400m",
     "memory": "500Mi"}, "requests": {"cpu": "100m", "memory": "64Mi"}}, "envoy": {"limits":
-    {"cpu": "500m", "memory": "64Mi"}, "requests": {"cpu": "32m", "memory": "64Mi"}},
-    "pgbouncer": {"limits": {"cpu": "500m", "memory": "20Mi"}, "requests": {"cpu":
+    {"cpu": "500m", "memory": "512Mi"}, "requests": {"cpu": "32m", "memory": "64Mi"}},
+    "pgbouncer": {"limits": {"cpu": "500m", "memory": "128Mi"}, "requests": {"cpu":
     "16m", "memory": "4Mi"}}, "postgresUtil": {"limits": {"cpu": "20m", "memory":
     "20Mi"}, "requests": {"cpu": "10m", "memory": "4Mi"}}, "prometheusPostgresExporter":
     {"limits": {"cpu": "150m", "memory": "256Mi"}, "requests": {"cpu": "10m", "memory":
diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
index d04789000..92b718459 100644
--- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
+++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -84,9 +84,9 @@ spec:
           sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "256Mi"},
             "requests": {"cpu": "32m", "memory": "128Mi"}}, "createBackup": {"limits":
             {"cpu": "400m", "memory": "500Mi"}, "requests": {"cpu": "100m", "memory":
-            "64Mi"}}, "envoy": {"limits": {"cpu": "500m", "memory": "64Mi"}, "requests":
+            "64Mi"}}, "envoy": {"limits": {"cpu": "500m", "memory": "512Mi"}, "requests":
             {"cpu": "32m", "memory": "64Mi"}}, "pgbouncer": {"limits": {"cpu": "500m",
-            "memory": "20Mi"}, "requests": {"cpu": "16m", "memory": "4Mi"}}, "postgresUtil":
+            "memory": "128Mi"}, "requests": {"cpu": "16m", "memory": "4Mi"}}, "postgresUtil":
             {"limits": {"cpu": "20m", "memory": "20Mi"}, "requests": {"cpu": "10m",
             "memory": "4Mi"}}, "prometheusPostgresExporter": {"limits": {"cpu": "150m",
             "memory": "256Mi"}, "requests": {"cpu": "10m", "memory": "16Mi"}}, "runDbops":