diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index eb54e59b3333a26199223c5a8f2b57ac51c0b45c..2158abf949a233c02de05e23a69d0b3be7d33e2a 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -76,7 +76,7 @@ spec:
       {{- if .Values.database.internal.storageSpec.hostPath }}
         - name: data
           hostPath:
-            path: /{{.Values.database.internal.storageSpec.hostPath.root | default "data" | quote}}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
+            path: {{.Values.database.internal.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
       {{- else if .Values.database.internal.storageSpec.emptyDir }}
         - name: data
           emptyDir: {}      
diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml
index ec289b72abec5e72ec25f8863c3772b9d3eee458..3416471864cdbef1df2fccae17dd4f7d7b7b4ee4 100644
--- a/templates/registry/registry-ss.yaml
+++ b/templates/registry/registry-ss.yaml
@@ -136,7 +136,7 @@ spec:
       {{- if .Values.registry.storageSpec.hostPath }}
       - name: data
         hostPath:
-          path: {{.Values.registry.storageSpec.hostPath.root | default "/data" | quote}}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
+          path: {{.Values.registry.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
       {{- else if .Values.registry.storageSpec.emptyDir }}
       - name: data
         emptyDir: {}