diff --git a/charts/supabase/templates/db/deployment.yaml b/charts/supabase/templates/db/deployment.yaml
index e75aadf57f9380ca992d8e700008aa4c13206a5f..e62694c158f6935f9eda74e3b77e876ef795bb62 100644
--- a/charts/supabase/templates/db/deployment.yaml
+++ b/charts/supabase/templates/db/deployment.yaml
@@ -46,6 +46,7 @@ spec:
               cp /custom-init-scripts/99-roles.sql /initdb.d/init-scripts/99-roles.sql
               # Initialize the database settings with JWT_SECRET and JWT_EXP
               cp /custom-init-scripts/99-jwt.sql /initdb.d/init-scripts/99-jwt.sql
+              # should not execute this script since it is already in the image
               cp /custom-init-scripts/97-_supabase.sql  /initdb.d/migrations/97-_supabase.sql
               cp /custom-init-scripts/99-logs.sql /initdb.d/migrations/99-logs.sql
               cp /custom-init-scripts/99-pooler.sql /initdb.d/migrations/99-pooler.sql
diff --git a/charts/supabase/templates/db/initdb.config.yaml b/charts/supabase/templates/db/initdb.config.yaml
index ce9b89b1492ddcaf787dffc32bf1d8ea428449cf..3790209edd29937a1e99ba499a5d69570e3a4b6e 100644
--- a/charts/supabase/templates/db/initdb.config.yaml
+++ b/charts/supabase/templates/db/initdb.config.yaml
@@ -257,8 +257,17 @@ data:
 
   97-_supabase.sql: |
     \set pguser `echo "$POSTGRES_USER"`
-
-    CREATE DATABASE _supabase WITH OWNER :pguser;
+    DO $$
+    BEGIN
+      IF NOT EXISTS (
+        SELECT FROM pg_database
+        WHERE datname = '_supabase'
+      ) THEN
+        EXECUTE 'CREATE DATABASE _supabase';
+      END IF;
+    END
+    $$;
+    ALTER DATABASE _supabase WITH OWNER :pguser;
 
 
 
diff --git a/charts/supabase/templates/vector/config.yaml b/charts/supabase/templates/vector/config.yaml
index 91032178c6fa52a392a52a1edc3f7368219bab9c..df2e897384de705233b38f9523ad1fd1aed06f35 100644
--- a/charts/supabase/templates/vector/config.yaml
+++ b/charts/supabase/templates/vector/config.yaml
@@ -186,7 +186,6 @@ data:
         method: 'post'
         request:
           retry_max_duration_secs: 10
-        encoding:
         uri: 'http://{{ include "supabase.analytics.fullname" . }}:{{ .Values.analytics.service.port }}/api/logs?source_name=gotrue.logs.prod&api_key=SECRET[credentials.logflare_api_key]'
       logflare_realtime:
         type: 'http'