diff --git a/manifests/archmeister/base/deployment_patch.yaml b/manifests/archmeister/base/deployment_patch.yaml
index 759b833c..c8368399 100644
--- a/manifests/archmeister/base/deployment_patch.yaml
+++ b/manifests/archmeister/base/deployment_patch.yaml
@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "archmeister"
-    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/manifests/archmeister/values-prod.yaml b/manifests/archmeister/values-prod.yaml
index 2b120e5d..79d4cbc5 100644
--- a/manifests/archmeister/values-prod.yaml
+++ b/manifests/archmeister/values-prod.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-archmeister"
+  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/manifests/archmeister/values-staging.yaml b/manifests/archmeister/values-staging.yaml
index 5ebc7a3c..890ebfec 100644
--- a/manifests/archmeister/values-staging.yaml
+++ b/manifests/archmeister/values-staging.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-archmeister"
+  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"
+
 image:
   tag: f8c27a74-debug
 ingress:
diff --git a/manifests/atlantis/base/deployment_patch.yaml b/manifests/atlantis/base/deployment_patch.yaml
index c4641cde..546c88e9 100644
--- a/manifests/atlantis/base/deployment_patch.yaml
+++ b/manifests/atlantis/base/deployment_patch.yaml
@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "atlantis"
-    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/manifests/atlantis/prod/kustomization.yaml b/manifests/atlantis/prod/kustomization.yaml
index ac15f353..3011fc8e 100644
--- a/manifests/atlantis/prod/kustomization.yaml
+++ b/manifests/atlantis/prod/kustomization.yaml
@@ -18,3 +18,4 @@ patches:
     path: deployment_patch.yaml
 resources:
   - ../base
+  - subscriptions.yaml
diff --git a/manifests/atlantis/manifests/subscriptions.yaml b/manifests/atlantis/prod/subscriptions.yaml
similarity index 75%
rename from manifests/atlantis/manifests/subscriptions.yaml
rename to manifests/atlantis/prod/subscriptions.yaml
index 2daf0fe2..2b23a45e 100644
--- a/manifests/atlantis/manifests/subscriptions.yaml
+++ b/manifests/atlantis/prod/subscriptions.yaml
@@ -6,8 +6,10 @@ spec:
   topic: hipster
   route: /hipster-events
   pubsubname: pubsub
+  metadata:
+    queueType: quorum
 scopes:
-- atlantis
+- prod-atlantis
 ---
 apiVersion: dapr.io/v1alpha1
 kind: Subscription
@@ -17,5 +19,7 @@ spec:
   topic: inbox
   route: /inbox-events
   pubsubname: pubsub
+  metadata:
+    queueType: quorum
 scopes:
-- atlantis
+- prod-atlantis
diff --git a/manifests/atlantis/staging/kustomization.yaml b/manifests/atlantis/staging/kustomization.yaml
index 871e2d2c..763d1b51 100644
--- a/manifests/atlantis/staging/kustomization.yaml
+++ b/manifests/atlantis/staging/kustomization.yaml
@@ -18,3 +18,4 @@ patches:
     path: deployment_patch.yaml
 resources:
   - ../base
+  - subscriptions.yaml
diff --git a/manifests/atlantis/staging/subscriptions.yaml b/manifests/atlantis/staging/subscriptions.yaml
new file mode 100644
index 00000000..1ee21939
--- /dev/null
+++ b/manifests/atlantis/staging/subscriptions.yaml
@@ -0,0 +1,25 @@
+apiVersion: dapr.io/v1alpha1
+kind: Subscription
+metadata:
+  name: hipster-events
+spec:
+  topic: hipster
+  route: /hipster-events
+  pubsubname: pubsub
+  metadata:
+    queueType: quorum
+scopes:
+- staging-atlantis
+---
+apiVersion: dapr.io/v1alpha1
+kind: Subscription
+metadata:
+  name: inbox-events
+spec:
+  topic: inbox
+  route: /inbox-events
+  pubsubname: pubsub
+  metadata:
+    queueType: quorum
+scopes:
+- staging-atlantis
diff --git a/manifests/atlantis/values-prod.yaml b/manifests/atlantis/values-prod.yaml
index 68fdc9cc..b185516f 100644
--- a/manifests/atlantis/values-prod.yaml
+++ b/manifests/atlantis/values-prod.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-atlantis"
+  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/manifests/atlantis/values-staging.yaml b/manifests/atlantis/values-staging.yaml
index 767d87c6..4c012a3a 100644
--- a/manifests/atlantis/values-staging.yaml
+++ b/manifests/atlantis/values-staging.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-atlantis"
+  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"
+
 image:
   tag: c0c8de05-debug
 ingress:
diff --git a/manifests/hipster/prod/bindings.yaml b/manifests/hipster/prod/bindings.yaml
index eb76de82..e20f70da 100644
--- a/manifests/hipster/prod/bindings.yaml
+++ b/manifests/hipster/prod/bindings.yaml
@@ -15,10 +15,10 @@ spec:
       name: prod-rabbitmq
       key:  connString
   - name: queueName
-    value: hipster-slurm-job-events
+    value: prod-hipster-slurm-job-events
   - name: durable
     value: true
   - name: contentType
     value: "application/json"
 scopes:
-  - hipster
+  - prod-hipster
diff --git a/manifests/hipster/staging/bindings.yaml b/manifests/hipster/staging/bindings.yaml
index 9fbb18aa..e68eab92 100644
--- a/manifests/hipster/staging/bindings.yaml
+++ b/manifests/hipster/staging/bindings.yaml
@@ -15,10 +15,10 @@ spec:
       name: staging-rabbitmq
       key:  connString
   - name: queueName
-    value: hipster-slurm-job-events
+    value: staging-hipster-slurm-job-events
   - name: durable
     value: true
   - name: contentType
     value: "application/json"
 scopes:
-  - hipster
+  - staging-hipster
diff --git a/manifests/petimeter/base/deployment_patch.yaml b/manifests/petimeter/base/deployment_patch.yaml
index 02dc45e2..4730e743 100644
--- a/manifests/petimeter/base/deployment_patch.yaml
+++ b/manifests/petimeter/base/deployment_patch.yaml
@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "petimeter"
-    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/manifests/petimeter/values-prod.yaml b/manifests/petimeter/values-prod.yaml
index 6c4170a8..5a44c3f6 100644
--- a/manifests/petimeter/values-prod.yaml
+++ b/manifests/petimeter/values-prod.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-petimeter"
+  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/manifests/petimeter/values-staging.yaml b/manifests/petimeter/values-staging.yaml
index 59b18978..9010f8ec 100644
--- a/manifests/petimeter/values-staging.yaml
+++ b/manifests/petimeter/values-staging.yaml
@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-petimeter"
+  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"
+
 image:
   tag: 3d8fcb2a-debug
 ingress: