diff --git a/charts/supabase/templates/db/storage.yaml b/charts/supabase/templates/db/storage.yaml
index 28ad48f0..356cacad 100644
--- a/charts/supabase/templates/db/storage.yaml
+++ b/charts/supabase/templates/db/storage.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.db.enabled -}}
 {{- if .Values.db.persistence.enabled -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -17,5 +18,4 @@ spec:
     requests:
       storage: {{ .Values.db.storage.size }}
 {{- end }}
-
-
+{{- end }}
diff --git a/charts/supabase/templates/kong/config.yaml b/charts/supabase/templates/kong/config.yaml
index fc4f22fc..a58f5a11 100644
--- a/charts/supabase/templates/kong/config.yaml
+++ b/charts/supabase/templates/kong/config.yaml
@@ -8,17 +8,17 @@ metadata:
 data:
   {{- toYaml .Values.kong.environment | nindent 2 }}
   wrapper.sh: |
-    #!/bin/sh
+    #!/bin/bash
 
     set -euo pipefail
 
-    echo "Replacing env placeholders of /home/kong/kong.yml"
+    echo "Replacing env placeholders of /usr/local/kong/kong.yml"
 
     sed \
     -e "s/\${SUPABASE_ANON_KEY}/${SUPABASE_ANON_KEY}/" \
     -e "s/\${SUPABASE_SERVICE_KEY}/${SUPABASE_SERVICE_KEY}/" \
-    /home/kong/template.yml \
-    > /home/kong/kong.yml
+    /usr/local/kong/template.yml \
+    > /usr/local/kong/kong.yml
 
     exec /docker-entrypoint.sh kong docker-start
 {{- if .Values.kong.config -}}
@@ -162,4 +162,4 @@ data:
               allow:
                 - admin
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/supabase/templates/kong/deployment.yaml b/charts/supabase/templates/kong/deployment.yaml
index 4981bddc..2e5e6dcf 100644
--- a/charts/supabase/templates/kong/deployment.yaml
+++ b/charts/supabase/templates/kong/deployment.yaml
@@ -34,7 +34,7 @@ spec:
             {{- toYaml .Values.kong.securityContext | nindent 12 }}
           image: "{{ .Values.kong.image.repository }}:{{ .Values.kong.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.kong.image.pullPolicy }}
-          command: ["/bin/sh"]
+          command: ["/bin/bash"]
           args: ["/scripts/wrapper.sh"]
           env:
             {{- range $key, $value := .Values.kong.environment }}
@@ -63,7 +63,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
-            - mountPath: /home/kong/template.yml
+            - mountPath: /usr/local/kong/template.yml
               name: config
               subPath: template.yml
             - mountPath: /scripts
@@ -101,4 +101,4 @@ spec:
         {{- with .Values.kong.volumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/supabase/values.yaml b/charts/supabase/values.yaml
index 3dd2c159..5ed84328 100644
--- a/charts/supabase/values.yaml
+++ b/charts/supabase/values.yaml
@@ -667,7 +667,7 @@ kong:
     port: 8000
   environment:
     KONG_DATABASE: "off"
-    KONG_DECLARATIVE_CONFIG: /home/kong/kong.yml
+    KONG_DECLARATIVE_CONFIG: /usr/local/kong/kong.yml
     # https://github.com/supabase/cli/issues/14
     KONG_DNS_ORDER: LAST,A,CNAME
     KONG_PLUGINS: request-transformer,cors,key-auth,acl
@@ -869,4 +869,4 @@ kong:
   #           config:
   #             hide_groups_header: true
   #             allow:
-  #               - admin
\ No newline at end of file
+  #               - admin