diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 976ee616fe1cf2038932cc6e8d7182e7b259c846..4e2c11f2d4d6b8a9d9f85898ac62496cf6f21177 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,9 +154,9 @@ deploy_g16_grb:
     - kubeconfig=$(basename $kubekorner_k3s_config)
     - echo "Deploying version $docker_tag to cluster namespace $ns"
     # copy extra values files to the local directory (where helm has access via docker mount)
-    - cp ../../production/values-g16-grb.yaml .
+    - cp ../../production/values-grb-g16.yaml .
     # namespace names are the same as domain names
-    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns -f values-g16-grb.yaml cspp-geo-grb cspp-geo-grb/
+    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns -f values-grb-g16.yaml cspp-geo-grb cspp-geo-grb/
   dependencies:
     - get_chart_grb
   rules:
@@ -169,23 +169,23 @@ deploy_geo2grid_g16_radf:
     name: production
     url: http://geosphere.ssec.wisc.edu
   extends: .helm_based_job
-  stage: deploy GRB
+  stage: deploy G2G
   script:
     - if [ -n "$CI_COMMIT_TAG" ]; then
       ns="geosphere";
       else
       ns="geosphere-test";
       fi
-    - cd geosphere-grb/chart
-    - source cspp-geo-grb/cibuild.env
+    - cd geosphere-geo2grid/chart
+    - source cspp-geo-geo2grid/cibuild.env
     # copy secret kubeconfig to the mounted (pwd) directory
     - cp $kubekorner_k3s_config .
     - kubeconfig=$(basename $kubekorner_k3s_config)
     - echo "Deploying version $docker_tag to cluster namespace $ns"
     # copy extra values files to the local directory (where helm has access via docker mount)
-    - cp ../../production/values-g16-grb.yaml .
+    - cp ../../production/values-geo2grid-g16-radf.yaml .
     # namespace names are the same as domain names
-    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns -f values-g16-grb.yaml cspp-geo-grb cspp-geo-grb/
+    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns -f values-geo2grid-g16-radf.yaml cspp-geo-geo2grid cspp-geo-geo2grid/
   dependencies:
     - get_chart_geo2grid
   rules:
diff --git a/production/values-geo2grid-g16-radf.yaml b/production/values-geo2grid-g16-radf.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..02c0a0e9feb3185984d40282cdf1b0f17cb01758
--- /dev/null
+++ b/production/values-geo2grid-g16-radf.yaml
@@ -0,0 +1,12 @@
+rabbitIn:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
+  topic: "data.goes.g16.abi.radf.l1b.netcdf.all.complete"
+source:
+  s3Endpoint: "http://geosphere-minio:9000"
+destination:
+#  s3Endpoint: "http://geosphere-minio:9000"
+  s3Secret: "geosphere-minio"
+  s3AccessKey: "accesskey"
+  s3SecretKey: "secretkey"
diff --git a/production/values-g16-grb.yaml b/production/values-grb-g16.yaml
similarity index 100%
rename from production/values-g16-grb.yaml
rename to production/values-grb-g16.yaml