diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh
index 91833dcc77062203ea2461e3598759a89e07f307..7cf2de2af2669692ce1f03d3d4d1328f009cb830 100755
--- a/ci_tests/run_basic_grb_test.sh
+++ b/ci_tests/run_basic_grb_test.sh
@@ -19,6 +19,8 @@ install_charts() {
     popd
 
     # Geo2Grid
+    grb_pvc=$(get_pvc_name ${GRB_RELEASE_NAME})
+    sed -i "s/cspp-geo-grb/${GRB_RELEASE_NAME}/g" "../../ci_tests/values-geo2grid-g16-radm1.yaml"
     ./helpers/deploy_geo2grid.sh "ci_tests" "${RELEASE_PREFIX}" "-g16-radm1"
 }
 
@@ -27,8 +29,14 @@ get_pod_name() {
     kubectl -n $ns get pods --selector=app.kubernetes.io/instance=${release_name} -o name
 }
 
+get_pvc_name() {
+    release_name="$1"
+    kubectl -n $ns get pvc --selector=app.kubernetes.io/instance=${release_name} -o name
+}
+
 wait_for_pod() {
     pod_name="$1"
+    debug "Waiting for ${pod_name} pod to be ready..."
     kubectl -n $ns wait --for=condition=Ready ${pod_name} --timeout=120s
 }
 
@@ -82,3 +90,4 @@ wait_for_pod ${GRB_POD_NAME} || error "GRB pod was never ready"
 run_grb_checks || error "GRB checks failed"
 wait_for_pod ${GEO2GRID_POD_NAME} || error "Geo2Grid pod was never ready"
 run_geo2grid_checks || error "Geo2Grid checks failed"
+
diff --git a/helpers/deploy_geo2grid.sh b/helpers/deploy_geo2grid.sh
index 31aaf8fa9cd8c35a7f47019c14d716969163729b..5a5089d9d54245f2f595414b855efbc30c7ad114 100755
--- a/helpers/deploy_geo2grid.sh
+++ b/helpers/deploy_geo2grid.sh
@@ -24,5 +24,4 @@ ns=$(./helpers/get_namespace.sh)
 cd geosphere-geo2grid/chart
 source cspp-geo-geo2grid/cibuild.env
 echo "Deploying version $docker_tag to cluster namespace $ns"
-# namespace names are the same as domain names
 helm upgrade -v 2 --install --namespace $ns -f ../../${values_base}/values-geo2grid${release_suffix}.yaml "${release_prefix}cspp-geo-geo2grid${release_suffix}" cspp-geo-geo2grid/