diff --git a/charts/prometheus-exporter/templates/_helpers.tpl b/charts/prometheus-exporter/templates/_helpers.tpl
index 3e1a497..6daef21 100644
--- a/charts/prometheus-exporter/templates/_helpers.tpl
+++ b/charts/prometheus-exporter/templates/_helpers.tpl
@@ -82,7 +82,7 @@ Create the name of the service account to use
   resources:
     {{- toYaml .Values.resources | nindent 4 }}
   volumeMounts:
-    - name: metric-volume
+    - name: {{ include "prometheus-exporter.fullname" . }}-metrics-volume
       mountPath: /app/var/metrics/
   {{- with .Values.volumeMounts }}
     {{- toYaml . | nindent 4 }}
@@ -111,10 +111,10 @@ Create the name of the service account to use
   resources:
     {{- toYaml .Values.resources | nindent 4 }}
   volumeMounts:
-    - name: nginx-config-volume
+    - name: {{ include "prometheus-exporter.fullname" . }}-nginx-config-volume
       mountPath: /etc/nginx/conf.d/default.conf
       subPath: nginx.conf
-    - name: nginx-config-volume
+    - name: {{ include "prometheus-exporter.fullname" . }}-nginx-config-volume
       mountPath: /etc/nginx/fastcgi_params
       subPath: fastcgi_params
     {{- with .Values.volumeMounts }}
diff --git a/charts/prometheus-exporter/templates/deployment.yaml b/charts/prometheus-exporter/templates/deployment.yaml
index 3041cf4..4400ed1 100644
--- a/charts/prometheus-exporter/templates/deployment.yaml
+++ b/charts/prometheus-exporter/templates/deployment.yaml
@@ -31,10 +31,10 @@ spec:
       containers:
         {{- include "prometheus-exporter.containers" . | nindent 8 }}
       volumes:
-        - name: nginx-config-volume
+        - name: {{ include "prometheus-exporter.fullname" . }}-nginx-config-volume
           configMap:
             name: {{ include "prometheus-exporter.fullname" . }}-nginx-config
-        - name: metrics-volume
+        - name: {{ include "prometheus-exporter.fullname" . }}-metrics-volume
           emptyDir: {}
       {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}