diff --git a/ci_tests/cleanup_basic_postgres_test.sh b/ci_tests/cleanup_basic_postgres_test.sh
index 034bc73ed0af2e036973b2b991e3c8652c629925..69911ed329f766707ccaf27f38de9bd1512d067c 100755
--- a/ci_tests/cleanup_basic_postgres_test.sh
+++ b/ci_tests/cleanup_basic_postgres_test.sh
@@ -6,7 +6,7 @@ source ./ci_tests/get_release_names.sh
 EXIT_STATUS=0
 check_and_uninstall "${ns}" "${GRB_RELEASE_NAME}" || EXIT_STATUS=$?
 check_and_uninstall "${ns}" "${RABBITMQ_RELEASE_NAME}" || EXIT_STATUS=$?
-#check_and_uninstall "${ns}" "${POSTGIS_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${POSTGIS_RELEASE_NAME}" || EXIT_STATUS=$?
 check_and_uninstall "${ns}" "${GEO2GRID_RELEASE_NAME}" || EXIT_STATUS=$?
 check_and_uninstall "${ns}" "${TILEGEN_RELEASE_NAME}" || EXIT_STATUS=$?
 check_and_uninstall "${ns}" "${MAPSERVER_RELEASE_NAME}" || EXIT_STATUS=$?
diff --git a/ci_tests/get_release_names.sh b/ci_tests/get_release_names.sh
index 66bc010d349041a2ec9d22a2a0cc2f1733eb4f17..6a6a619042f6c910e4aba175fbdb71ec0c2c5df2 100755
--- a/ci_tests/get_release_names.sh
+++ b/ci_tests/get_release_names.sh
@@ -4,7 +4,7 @@ export RELEASE_PREFIX="${CI_JOB_NAME//_/-}-${CI_JOB_ID//_/-}-"
 export GRB_RELEASE_NAME="${RELEASE_PREFIX}cspp-geo-grb"
 export RABBITMQ_RELEASE_NAME="${RELEASE_PREFIX}geosphere-rabbit"
 export RABBITMQ_SERVICE_NAME="${RABBITMQ_RELEASE_NAME}-rabbitmq"
-export POSTGIS_RELEASE_NAME="${RELEASE_PREFIX}geosphere-postgis"
+export POSTGIS_RELEASE_NAME="${RELEASE_PREFIX}pgtest"  # need short name
 export POSTGIS_SERVICE_NAME="${POSTGIS_RELEASE_NAME}-postgresql"
 export GEO2GRID_RELEASE_NAME="${RELEASE_PREFIX}cspp-geo-geo2grid-g16-radm1"
 export TILEGEN_RELEASE_NAME="${RELEASE_PREFIX}geosphere-tile-gen-g16-radm1"
diff --git a/ci_tests/gitlab-ci.yaml b/ci_tests/gitlab-ci.yaml
index f435e1d3d940d73d490ddfb2e697490167c65216..2ca3be156b97817809e0dcdad368aab281b6f921 100644
--- a/ci_tests/gitlab-ci.yaml
+++ b/ci_tests/gitlab-ci.yaml
@@ -27,7 +27,7 @@ test_basic_grb:
   rules:
     - when: on_success
 
-test_basic_postgres:
+test_basic_pg:
   extends: .helm_based_job
   stage: test
   script:
diff --git a/helpers/deploy_postgis.sh b/helpers/deploy_postgis.sh
index 552f23f0899f12df74e3aa10b7fef497b18b3fe2..d97a047840c7e88a39702430b5d076da08ee1dca 100755
--- a/helpers/deploy_postgis.sh
+++ b/helpers/deploy_postgis.sh
@@ -38,10 +38,6 @@ helm upgrade -v 2 --install -f ${values_base}/values-postgis.yaml $EXTRA_ARGS --
 # do a little waiting for the postgres pod to be ready so future stages
 # don't fail to communicate with it
 echo "Start waiting for postgres: $(date +%Y%m%dT%H%M%S)"
-kubectl -n $ns get pods
-sleep 25
-echo "Done sleeping. Making sure the pod(s) are ready. ${release_name}"
-kubectl -n $ns get pods
 kubectl wait -n $ns --selector=app.kubernetes.io/instance=${release_name} --timeout 120s --for=condition=Ready pod
 status=$?
 echo "Done waiting for postgis: $(date +%Y%m%dT%H%M%S) : $status"