diff --git a/charts/atlantis/prod/deployment_patch.yaml b/charts/atlantis/prod/deployment_patch.yaml
index 2197b1e2..b4e37870 100644
--- a/charts/atlantis/prod/deployment_patch.yaml
+++ b/charts/atlantis/prod/deployment_patch.yaml
@@ -2,7 +2,8 @@
   path: /spec/template/metadata/annotations
   value:
     dapr.io/enabled: "true"
-    dapr.io/app-id: "prod-atlantis"
+    dapr.io/app-id: "atlantis"
+    dapr.io/app-id: "atlantis"
     dapr.io/app-port: "8000"
     dapr.io/config: "tracing"
 - op: add
diff --git a/charts/atlantis/staging/deployment_patch.yaml b/charts/atlantis/staging/deployment_patch.yaml
index 35ed76e6..7f47a002 100644
--- a/charts/atlantis/staging/deployment_patch.yaml
+++ b/charts/atlantis/staging/deployment_patch.yaml
@@ -2,7 +2,8 @@
   path: /spec/template/metadata/annotations
   value:
     dapr.io/enabled: "true"
-    dapr.io/app-id: "staging-atlantis"
+    dapr.io/app-id: "atlantis"
+    dapr.io/app-id: "atlantis"
     dapr.io/app-port: "8000"
     dapr.io/config: "tracing"
 - op: replace
diff --git a/charts/dex/manifests/dex.yaml b/charts/dex/manifests/dex.yaml
index e51744a6..68e70739 100644
--- a/charts/dex/manifests/dex.yaml
+++ b/charts/dex/manifests/dex.yaml
@@ -31,7 +31,7 @@ spec:
         helm:
           valueFiles:
             - $values/charts/dex/values.yaml
-            - $values/charts/dex/{{ env }}-values.yaml
+            - $values/charts/dex/values-{{ env }}.yaml
       - repoURL: https://gitlab.com/oceanbox/manifests.git
         targetRevision: dev
         ref: values
diff --git a/charts/hipster/prod/deployment_patch.yaml b/charts/hipster/prod/deployment_patch.yaml
index 59edb649..d554cbab 100644
--- a/charts/hipster/prod/deployment_patch.yaml
+++ b/charts/hipster/prod/deployment_patch.yaml
@@ -2,7 +2,8 @@
   path: /spec/template/metadata/annotations
   value:
     dapr.io/enabled: "true"
-    dapr.io/app-id: "production-hipster"
+    dapr.io/app-id: "hipster"
+    dapr.io/app-id: "hipster"
     dapr.io/app-port: "8000"
     dapr.io/config: "tracing"
 - op: add
diff --git a/charts/hipster/staging/deployment_patch.yaml b/charts/hipster/staging/deployment_patch.yaml
index bb69623b..115fca02 100644
--- a/charts/hipster/staging/deployment_patch.yaml
+++ b/charts/hipster/staging/deployment_patch.yaml
@@ -2,7 +2,8 @@
   path: /spec/template/metadata/annotations
   value:
     dapr.io/enabled: "true"
-    dapr.io/app-id: "staging-hipster"
+    dapr.io/app-id: "hipster"
+    dapr.io/app-id: "hipster"
     dapr.io/app-port: "8000"
     dapr.io/config: "tracing"
 - op: add