diff --git a/charts/hipster/base/deployment_patch.yaml b/charts/hipster/base/deployment_patch.yaml
index d9bad0ee..c8368399 100644
--- a/charts/hipster/base/deployment_patch.yaml
+++ b/charts/hipster/base/deployment_patch.yaml
@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "hipster"
-    dapr.io/app-port: "8000"
-    dapr.io/config: "tracing"
-    dapr.io/app-protocol: "http"
-    dapr.io/enable-app-health-check: "true"
-    dapr.io/app-health-check-path: "/healthz"
-    dapr.io/app-health-probe-interval: "3"
-    dapr.io/app-health-probe-timeout: "200"
-    dapr.io/app-health-threshold: "2"
-    dapr.io/sidecar-cpu-request: "100m"
-    dapr.io/sidecar-memory-request: "250Mi"
-    dapr.io/sidecar-cpu-limit: "300m"
-    dapr.io/sidecar-memory-limit: "1000Mi"
-    dapr.io/log-as-json: "true"
 - op: replace
   path: /spec/template/spec/containers/0/livenessProbe/httpGet/path
   value: /healthz
diff --git a/charts/hipster/values-prod.yaml b/charts/hipster/values-prod.yaml
index d243a65e..f2bb2203 100644
--- a/charts/hipster/values-prod.yaml
+++ b/charts/hipster/values-prod.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-hipster"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  dapr.io/config: "tracing"
+  dapr.io/app-protocol: "http"
+  dapr.io/enable-app-health-check: "true"
+  dapr.io/app-health-check-path: "/healthz"
+  dapr.io/app-health-probe-interval: "3"
+  dapr.io/app-health-probe-timeout: "200"
+  dapr.io/app-health-threshold: "2"
+  dapr.io/sidecar-cpu-request: "100m"
+  dapr.io/sidecar-memory-request: "250Mi"
+  dapr.io/sidecar-cpu-limit: "300m"
+  dapr.io/sidecar-memory-limit: "1000Mi"
+  dapr.io/log-as-json: "true"
+
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
diff --git a/charts/hipster/values-staging.yaml b/charts/hipster/values-staging.yaml
index 7d5fb210..c8d6390f 100644
--- a/charts/hipster/values-staging.yaml
+++ b/charts/hipster/values-staging.yaml
@@ -1,5 +1,23 @@
 image:
   tag: 8c5cf432-debug
+
+podAnnotations:
+  dapr.io/app-id: "staging-hipster"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  dapr.io/config: "tracing"
+  dapr.io/app-protocol: "http"
+  dapr.io/enable-app-health-check: "true"
+  dapr.io/app-health-check-path: "/healthz"
+  dapr.io/app-health-probe-interval: "3"
+  dapr.io/app-health-probe-timeout: "200"
+  dapr.io/app-health-threshold: "2"
+  dapr.io/sidecar-cpu-request: "100m"
+  dapr.io/sidecar-memory-request: "250Mi"
+  dapr.io/sidecar-cpu-limit: "300m"
+  dapr.io/sidecar-memory-limit: "1000Mi"
+  dapr.io/log-as-json: "true"
+
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging
diff --git a/resources/atlantis/manifests/prod/state-redis.yaml b/resources/atlantis/manifests/prod/state-redis.yaml
index 8fe2fdf0..70ecd0fc 100644
--- a/resources/atlantis/manifests/prod/state-redis.yaml
+++ b/resources/atlantis/manifests/prod/state-redis.yaml
@@ -18,7 +18,7 @@ spec:
   - name: actorStateStore
     value: "true"
 scopes:
-  - atlantis
-  - petimeter
-  - hipster
-  - archmeister
+  - prod-atlantis
+  - prod-petimeter
+  - prod-hipster
+  - prod-archmeister
diff --git a/resources/atlantis/manifests/staging/state-redis.yaml b/resources/atlantis/manifests/staging/state-redis.yaml
index 0f08c2cf..1393a511 100644
--- a/resources/atlantis/manifests/staging/state-redis.yaml
+++ b/resources/atlantis/manifests/staging/state-redis.yaml
@@ -17,8 +17,8 @@ spec:
       key:  redis-password
   - name: actorStateStore
     value: "true"
-scopes:
-  - atlantis
-  - petimeter
-  - hipster
-  - archmeister
+# scopes:
+#   - staging-atlantis
+#   - staging-petimeter
+#   - staging-hipster
+#   - staging-archmeister