diff --git a/ci_gcp/gitlab-ci.yaml b/ci_gcp/gitlab-ci.yaml
index 3f14f676bef9c9878521f46b8346d50fa7ad590a..235fff0f7d2838a48fd8526767d7a99076ce3a85 100644
--- a/ci_gcp/gitlab-ci.yaml
+++ b/ci_gcp/gitlab-ci.yaml
@@ -32,20 +32,20 @@ gcp create geotiff storage:
         - ci_gcp/geotiff-pvc.yaml
     - if: $CREATE_STORAGE
 
-gcp create postgres storage:
-  extends: .helm_based_job
-  stage: create storage
-  script:
-    - ns=$(./helpers/get_namespace.sh)
-    - ./helpers/create_pvc.sh "$ns" "ci_gcp/postgres-pvc.yaml" "geosphere-postgis"
-  # this job doesn't actually need any artifacts from previous jobs
-  dependencies: []
-  rules:
-    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
-      when: never
-    - changes:
-        - ci_gcp/postgres-pvc.yaml
-    - if: $CREATE_STORAGE
+#gcp create postgres storage:
+#  extends: .helm_based_job
+#  stage: create storage
+#  script:
+#    - ns=$(./helpers/get_namespace.sh)
+#    - ./helpers/create_pvc.sh "$ns" "ci_gcp/postgres-pvc.yaml" "geosphere-postgis"
+#  # this job doesn't actually need any artifacts from previous jobs
+#  dependencies: []
+#  rules:
+#    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+#      when: never
+#    - changes:
+#        - ci_gcp/postgres-pvc.yaml
+#    - if: $CREATE_STORAGE
 
 gcp create shapefile storage:
   extends: .helm_based_job
diff --git a/ci_gcp/values-postgis.yaml b/ci_gcp/values-postgis.yaml
index 4ceb25ff36ba3768a22b3fef966983705c92b539..61ff6dd9da067a09aba1a08306ed05fcdf0075a6 100644
--- a/ci_gcp/values-postgis.yaml
+++ b/ci_gcp/values-postgis.yaml
@@ -2,7 +2,11 @@ postgresqlDatabase: "postgres"
 postgresqlExtendedConf:
   sharedBuffers: "512MB"
 persistence:
-  enabled: true
-  existingClaim: "geosphere-postgis"
+  enabled: false
+#  existingClaim: "geosphere-postgis"
 metrics:
   enabled: false
+primary:
+  nodeSelector:
+    geosphere-node: database
+