diff --git a/chart/templates/cron-job.yaml b/chart/templates/cron-job.yaml
index c453e24c361fafc8bf5922b1fdb8148149a45245..ed595b6d2dc378126608bd2a9ef1c896fc7a4a34 100644
--- a/chart/templates/cron-job.yaml
+++ b/chart/templates/cron-job.yaml
@@ -31,5 +31,5 @@ spec:
           volumes:
             - name: server-static
               persistentVolumeClaim:
-                claimName: "server-static"
+                claimName: {{ printf "server-static-%s" .Release.Name}}
 
diff --git a/chart/templates/deployment-celery.yaml b/chart/templates/deployment-celery.yaml
index 2254e8e1eb296545aac45b1755066e29af8e49f9..0b842187b2ac31321d2b7ba1435d7869415768ee 100644
--- a/chart/templates/deployment-celery.yaml
+++ b/chart/templates/deployment-celery.yaml
@@ -91,7 +91,7 @@ spec:
       volumes:
         - name: server-static
           persistentVolumeClaim:
-            claimName: "server-static"
+            claimName: {{ printf "server-static-%s" .Release.Name}}
 
         # - name: server-static
         #   emptyDir: {}
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index 4e7a5b41764e384bcb010d76420b9c1862f328c6..81302a8b9d8ed3a66fc64168ca6242fc823fdc8f 100644
--- a/chart/templates/deployment-django.yaml
+++ b/chart/templates/deployment-django.yaml
@@ -112,9 +112,9 @@ spec:
           limits:
             memory: "128Mi"
             cpu: "100m"
-        volumeMounts:
-          - name: server-static
-            mountPath: /usr/src/app/static
+        # volumeMounts:
+        #   - name: server-static
+        #     mountPath: /usr/src/app/static
 
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/chart/templates/pvc-django-static.yaml b/chart/templates/pvc-django-static.yaml
index 418301b50f21cd5e34ef89b5527ff169124dc320..68dd87b3cbd9c2786100d9b17c2cc04ce963583d 100644
--- a/chart/templates/pvc-django-static.yaml
+++ b/chart/templates/pvc-django-static.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: "server-static"
+  name: {{ printf "server-static-%s" .Release.Name}}
 spec:
   accessModes:
     - ReadWriteMany