diff --git a/charts/code-server/templates/deployment.yaml b/charts/code-server/templates/deployment.yaml
index 60caa330..9364a470 100644
--- a/charts/code-server/templates/deployment.yaml
+++ b/charts/code-server/templates/deployment.yaml
@@ -74,11 +74,7 @@ spec:
         {{- end }}
           volumeMounts:
           - name: data
-            mountPath: /home/coder/project
-            subPath: project
-          - name: data
-            mountPath: /home/coder/.local/share/code-server
-            subPath: code-server
+            mountPath: /home/coder
           {{- range .Values.extraConfigmapMounts }}
           - name: {{ .name }}
             mountPath: {{ .mountPath }}
@@ -126,19 +122,31 @@ spec:
       volumes:
       - name: data
       {{- if .Values.persistence.enabled }}
+        {{- if not .Values.persistence.hostPath }}
         persistentVolumeClaim:
           claimName: {{ .Values.persistence.existingClaim | default (include "code-server.fullname" .) }}
+        {{- else }}
+        hostPath:
+          path: {{ .Values.persistence.hostPath }}
+          type: Directory
+        {{- end -}}
       {{- else }}
         emptyDir: {}
       {{- end -}}
       {{- range .Values.extraSecretMounts }}
-        - name: {{ .name }}
-          secret:
-            secretName: {{ .secretName }}
-            defaultMode: {{ .defaultMode }}
+      - name: {{ .name }}
+        secret:
+          secretName: {{ .secretName }}
+          defaultMode: {{ .defaultMode }}
       {{- end }}
       {{- range .Values.extraVolumeMounts }}
-        - name: {{ .name }}
-          persistentVolumeClaim:
-            claimName: {{ .existingClaim }}
+      - name: {{ .name }}
+        {{- if .existingClaim }}
+        persistentVolumeClaim:
+          claimName: {{ .existingClaim }}
+        {{- else }}
+        hostPath:
+          path: {{ .hostPath }}
+          type: Directory
+        {{- end }}
       {{- end }}
diff --git a/charts/code-server/templates/pvc.yaml b/charts/code-server/templates/pvc.yaml
index f2930147..2f1c8740 100644
--- a/charts/code-server/templates/pvc.yaml
+++ b/charts/code-server/templates/pvc.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+{{- if and (and .Values.persistence.enabled (not .Values.persistence.existingClaim)) (not .Values.persistence.hostPath) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
diff --git a/charts/code-server/values.yaml b/charts/code-server/values.yaml
index 18211654..eff18035 100644
--- a/charts/code-server/values.yaml
+++ b/charts/code-server/values.yaml
@@ -115,6 +115,7 @@ persistence:
   size: 1Gi
   annotations: {}
   # existingClaim: ""
+  # hostPath: /data
 
 serviceAccount:
   create: true
@@ -152,6 +153,7 @@ extraVolumeMounts: []
   #   mountPath: /mnt/volume
   #   readOnly: true
   #   existingClaim: volume-claim
+  #   hostPath: ""
 
 extraConfigmapMounts: []
   # - name: certs-configmap