diff --git a/charts/diagrid-dashboard/templates/deployment.yaml b/charts/diagrid-dashboard/templates/deployment.yaml
index 8efe6445..f326ee39 100644
--- a/charts/diagrid-dashboard/templates/deployment.yaml
+++ b/charts/diagrid-dashboard/templates/deployment.yaml
@@ -59,12 +59,18 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- with .Values.volumeMounts }}
           volumeMounts:
+            - name: statestore
+              mountPath: /app/components/statestore.yaml
+              subPath: statestore.yaml
+          {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
-      {{- with .Values.volumes }}
       volumes:
+        - name: statestore
+          configMap:
+            name: {{ include "diagrid-dashboard.fullname" . }}-statestore
+      {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/diagrid-dashboard/templates/statestore.yaml b/charts/diagrid-dashboard/templates/statestore.yaml
index 67b02e5e..040db747 100644
--- a/charts/diagrid-dashboard/templates/statestore.yaml
+++ b/charts/diagrid-dashboard/templates/statestore.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: diadash-statestore
+  name: {{ include "diagrid-dashboard.fullname" . }}-statestore
 data:
   statestore.yaml: |
     apiVersion: dapr.io/v1alpha1
@@ -17,10 +17,9 @@ data:
         - name: redisUsername
           value: default
         - name: redisPassword
-          value: mrtz-password
-          # secretKeyRef:
-          #   key: redis-password
-          #   name: {{ .Values.statestore.redis }}
+          secretKeyRef:
+            key: redis-password
+            name: {{ .Values.statestore.redis }}
         - name: actorStateStore
           value: "true"
         - name: redisDB
diff --git a/charts/diagrid-dashboard/values.yaml b/charts/diagrid-dashboard/values.yaml
index 61642587..c874fcf4 100644
--- a/charts/diagrid-dashboard/values.yaml
+++ b/charts/diagrid-dashboard/values.yaml
@@ -148,16 +148,10 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 # Additional volumes on the output Deployment definition.
-volumes:
-  - name: statestore
-    configMap:
-      name: diadash-statestore
+volumes: {}
 
 # Additional volumeMounts on the output Deployment definition.
-volumeMounts:
-  - name: statestore
-    mountPath: /app/components/statestore.yaml
-    subPath: statestore.yaml
+volumeMounts: {}
 
 nodeSelector: {}