diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34d2ee114e286b1f54d3971ed4f19fc486d746a3..6f12e205321c779f5570992e50c968ffb35006f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,7 +109,7 @@ deploy_prod_rabbit:
     - kubeconfig=$(basename $kubekorner_k3s_config)
     # install third-party rabbitmq server
     - helm repo add bitnami https://charts.bitnami.com/bitnami
-    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns geosphere-rabbit bitnami/rabbitmq
+    - helm upgrade -v 2 --install --kubeconfig $kubeconfig -f production/values-geosphere-rabbit.yaml --namespace $ns geosphere-rabbit bitnami/rabbitmq
   rules:
     - if: '$kubekorner_k3s_config == ""'
       when: never
diff --git a/production/values-g16-grb.yaml b/production/values-g16-grb.yaml
index 1da3406aa8328189ee3d7ead090738ed92dc56a9..bf80cfaf26f3ac211c71eb52401861cc6c20a2d3 100644
--- a/production/values-g16-grb.yaml
+++ b/production/values-g16-grb.yaml
@@ -5,4 +5,5 @@ grbProcessor:
 
 grbNotifier:
   rabbitOut:
-    host: "geosphere-rabbit-rabbitmq"
\ No newline at end of file
+    host: "geosphere-rabbit-rabbitmq"
+    passwordSecret: "geosphere-rabbit-rabbitmq"
\ No newline at end of file
diff --git a/production/values-geosphere-rabbit.yaml b/production/values-geosphere-rabbit.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3fbe89694c906dbc13e077a5d719236a821bbabe
--- /dev/null
+++ b/production/values-geosphere-rabbit.yaml
@@ -0,0 +1,12 @@
+#rabbitmq:
+#  configuration: |-
+#    ## Clustering
+#    cluster_formation.peer_discovery_backend  = rabbit_peer_discovery_k8s
+#    cluster_formation.k8s.host = kubernetes.default.svc.cluster.local
+#    cluster_formation.node_cleanup.interval = 10
+#    cluster_formation.node_cleanup.only_log_warning = true
+#    cluster_partition_handling = autoheal
+#    # queue master locator
+#    queue_master_locator=min-masters
+#    # enable guest user
+#    loopback_users.guest = false