diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh
index 755754847b0e88ea222aca19ed862f4cbb4af742..53d133f29b30a7590a2544aaeb462dcbe0fbff82 100755
--- a/ci_tests/run_basic_grb_test.sh
+++ b/ci_tests/run_basic_grb_test.sh
@@ -11,7 +11,7 @@ error() {
 
 install_charts() {
     # use the production rabbitmq config
-    ./helpers/deploy_rabbitmq.sh ci_geosphere
+    ./helpers/deploy_rabbitmq.sh "ci_tests"
 
     # GRB
     pushd geosphere-grb/chart
@@ -19,7 +19,7 @@ install_charts() {
     popd
 
     # Geo2Grid
-    ./helpers/deploy_geo2grid.sh "ci_tests" "-g16-radm1"
+    ./helpers/deploy_geo2grid.sh "ci_tests" "${RELEASE_PREFIX}" "-g16-radm1"
 }
 
 get_pod_name() {
diff --git a/ci_tests/values-geosphere-rabbit.yaml b/ci_tests/values-geosphere-rabbit.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..98bf879e2a939998e0832f3a8a1eb66fad6e18b5
--- /dev/null
+++ b/ci_tests/values-geosphere-rabbit.yaml
@@ -0,0 +1,3 @@
+# persisting the secret only causes issues for failed tests
+persistence:
+  enabled: false