diff --git a/applications/hipster.yaml b/applications/hipster.yaml
index 390e8804..919e6648 100644
--- a/applications/hipster.yaml
+++ b/applications/hipster.yaml
@@ -37,9 +37,6 @@ spec:
             string: '{{ .env }}'
           - name: hostname
             string: '{{ .hostname }}'
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: dev
-        path: charts/hipster/manifests
   templatePatch: |
     {{- if .autoSync }}
     spec:
diff --git a/charts/hipster/base/kustomization.yaml b/charts/hipster/base/kustomization.yaml
index cfc8c8d9..43173a86 100644
--- a/charts/hipster/base/kustomization.yaml
+++ b/charts/hipster/base/kustomization.yaml
@@ -5,12 +5,10 @@ patches:
       version: v1
       group: apps
       kind: Deployment
-      name: hipster
     path: deployment_patch.yaml
   - target:
       version: v1
       kind: Service
-      name: hipster
     path: service_patch.yaml
 resources:
   - _manifest.yaml
diff --git a/charts/hipster/chart/values.yaml b/charts/hipster/chart/values.yaml
index 5783b783..e0062e30 100644
--- a/charts/hipster/chart/values.yaml
+++ b/charts/hipster/chart/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: registry.gitlab.com/oceanbox/hipster
-  tag: latest
+  tag: v2.5.0
   pullPolicy: IfNotPresent
 
 init:
diff --git a/charts/hipster/manifests/hipster-env-secret.yaml b/charts/hipster/manifests/hipster-env-secret.yaml
deleted file mode 100644
index f7283920..00000000
--- a/charts/hipster/manifests/hipster-env-secret.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hipster-env
-  namespace: atlantis
-stringData:
-  SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
-type: Opaque
diff --git a/charts/hipster/prod/appsettings.json b/charts/hipster/prod/appsettings.json
index f099b40e..a6129958 100644
--- a/charts/hipster/prod/appsettings.json
+++ b/charts/hipster/prod/appsettings.json
@@ -4,11 +4,11 @@
         "slurmApi": "slurm/v0.0.38/",
         "dbdApi": "slurmdbd/v0.0.38/",
         "user": "serf",
-        "password": "wooqueiLee3ao0ha"
+        "password": ""
     },
     "amqp": {
-        "auth": "user:bunny",
-        "host": "10.1.8.60:30673"
+        "auth": "",
+        "host": "prod-rabbitmq.rabbitmq.svc"
     },
     "archmeister": "https://archmeister.srv.oceanbox.io",
     "pubsubName": "pubsub",
diff --git a/charts/hipster/manifests/bindings.yaml b/charts/hipster/prod/bindings.yaml
similarity index 78%
rename from charts/hipster/manifests/bindings.yaml
rename to charts/hipster/prod/bindings.yaml
index 0991fe78..bf5f949a 100644
--- a/charts/hipster/manifests/bindings.yaml
+++ b/charts/hipster/prod/bindings.yaml
@@ -17,17 +17,14 @@ spec:
   - name: username
     value: user
   - name: password
-    value:
-     secretKeyRef:
-      name: rabbitmq-secret
+    secretKeyRef:
+      name: prod-rabbitmq
       key:  rabbitmq-password
   - name: queueName
-    value: <x>-slurm-job-events
+    value: prod-hipster-slurm-job-events
   - name: durable
     value: true
   - name: contentType
     value: "application/json"
 scopes:
-  - staging-hipster
-  - production-hipster
-  - x-review-hipster
+  - hipster
diff --git a/charts/hipster/prod/default.env b/charts/hipster/prod/default.env
new file mode 100644
index 00000000..563701b3
--- /dev/null
+++ b/charts/hipster/prod/default.env
@@ -0,0 +1,2 @@
+SLURM_PASSWORD=wooqueiLee3ao0ha
+SEQ_APIKEY=bFdYPKLDvnau3fQa1vRV
diff --git a/charts/hipster/prod/deployment_patch.yaml b/charts/hipster/prod/deployment_patch.yaml
index d554cbab..1a13330c 100644
--- a/charts/hipster/prod/deployment_patch.yaml
+++ b/charts/hipster/prod/deployment_patch.yaml
@@ -25,6 +25,11 @@
 - op: replace
   path: /spec/template/spec/containers/0/readinessProbe/httpGet/path
   value: /healthz
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: AMQP_USER
+    value: user
 - op: add
   path: /spec/template/spec/containers/0/env/-
   value:
@@ -37,4 +42,4 @@
   path: /spec/template/spec/containers/0/envFrom/-
   value:
     secretRef:
-      name: hipster-env
+      name: prod-hipster-env
diff --git a/charts/hipster/prod/kustomization.yaml b/charts/hipster/prod/kustomization.yaml
index 20df177d..bbc79dfa 100644
--- a/charts/hipster/prod/kustomization.yaml
+++ b/charts/hipster/prod/kustomization.yaml
@@ -1,16 +1,17 @@
-namePrefix: production-
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
-  - name: hipster-appsettings
-    files:
-      - appsettings.json
+- name: prod-hipster-appsettings
+  files:
+  - appsettings.json
+- name: prod-hipster-env
+  envs:
+  - default.env
 patches:
   - target:
       group: apps
       version: v1
       kind: Deployment
-      name: hipster
     path: deployment_patch.yaml
 resources:
   - ../base
diff --git a/charts/hipster/staging/appsettings.json b/charts/hipster/staging/appsettings.json
index cdb23862..3c485b74 100644
--- a/charts/hipster/staging/appsettings.json
+++ b/charts/hipster/staging/appsettings.json
@@ -7,8 +7,8 @@
         "password": "wooqueiLee3ao0ha"
     },
     "amqp": {
-        "auth": "user:bunny",
-        "host": "10.1.8.60:30673"
+        "auth": "",
+        "host": "staging-rabbitmq.rabbitmq.svc"
     },
     "archmeister": "https://archmeister.beta.oceanbox.io",
     "pubsubName": "pubsub",
diff --git a/charts/hipster/staging/bindings.yaml b/charts/hipster/staging/bindings.yaml
new file mode 100644
index 00000000..0a8098ad
--- /dev/null
+++ b/charts/hipster/staging/bindings.yaml
@@ -0,0 +1,30 @@
+#
+# Create a queue binding for receiving events from RabbitMQ.
+# Used by Hipster to get info about changes in job status from slurm.
+#
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: slurm-events
+spec:
+  type: bindings.rabbitmq
+  version: v1
+  metadata:
+  - name: hostname
+    value: staging-rabbitmq.rabbitmq.svc
+  - name: protocol
+    value: amqp
+  - name: username
+    value: user
+  - name: password
+    secretKeyRef:
+      name: staging-rabbitmq
+      key:  rabbitmq-password
+  - name: queueName
+    value: staging-hipster-slurm-job-events
+  - name: durable
+    value: true
+  - name: contentType
+    value: "application/json"
+scopes:
+  - hipster
diff --git a/charts/hipster/staging/default.env b/charts/hipster/staging/default.env
new file mode 100644
index 00000000..563701b3
--- /dev/null
+++ b/charts/hipster/staging/default.env
@@ -0,0 +1,2 @@
+SLURM_PASSWORD=wooqueiLee3ao0ha
+SEQ_APIKEY=bFdYPKLDvnau3fQa1vRV
diff --git a/charts/hipster/staging/deployment_patch.yaml b/charts/hipster/staging/deployment_patch.yaml
index 115fca02..7b9603ba 100644
--- a/charts/hipster/staging/deployment_patch.yaml
+++ b/charts/hipster/staging/deployment_patch.yaml
@@ -42,4 +42,4 @@
   path: /spec/template/spec/containers/0/envFrom/-
   value:
     secretRef:
-      name: hipster-env
+      name: staging-hipster-env
diff --git a/charts/hipster/staging/kustomization.yaml b/charts/hipster/staging/kustomization.yaml
index a9d6a069..0d2be5d4 100644
--- a/charts/hipster/staging/kustomization.yaml
+++ b/charts/hipster/staging/kustomization.yaml
@@ -1,16 +1,17 @@
-namePrefix: staging-
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
-  - name: hipster-appsettings
-    files:
-      - appsettings.json
+- name: staging-hipster-appsettings
+  files:
+  - appsettings.json
+- name: staging-hipster-env
+  envs:
+  - default.env
 patches:
   - target:
       group: apps
       version: v1
       kind: Deployment
-      name: hipster
     path: deployment_patch.yaml
 resources:
   - ../base
diff --git a/charts/hipster/values-prod.yaml b/charts/hipster/values-prod.yaml
index 3bfbef79..d243a65e 100644
--- a/charts/hipster/values-prod.yaml
+++ b/charts/hipster/values-prod.yaml
@@ -1,5 +1,3 @@
-fullnameOverride: hipster
-
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
diff --git a/charts/hipster/values-staging.yaml b/charts/hipster/values-staging.yaml
index e204cf1f..bae21bd5 100644
--- a/charts/hipster/values-staging.yaml
+++ b/charts/hipster/values-staging.yaml
@@ -1,5 +1,3 @@
-fullnameOverride: hipster
-
 image:
   tag:  d3af2100-debug