diff --git a/docker/initdb/00_create_db.sh b/docker/initdb/00_create_db.sh
new file mode 100755
index 0000000..62f71bb
--- /dev/null
+++ b/docker/initdb/00_create_db.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "postgres" <<'EOSQL'
+DO $$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'kngil') THEN
+    CREATE DATABASE kngil;
+  END IF;
+END
+$$;
+EOSQL
diff --git a/docker/initdb/01_kngil_DB.sql b/docker/initdb/01_kngil_DB.sql
index 60695f6..f439597 100644
--- a/docker/initdb/01_kngil_DB.sql
+++ b/docker/initdb/01_kngil_DB.sql
@@ -20,14 +20,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Ensure target database exists (idempotent for init scripts)
---
-\connect postgres
-SELECT 'CREATE DATABASE kngil'
-WHERE NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'kngil')\gexec
-\connect kngil
-
 --
 -- TOC entry 6 (class 2615 OID 16413)
 -- Name: kngil; Type: SCHEMA; Schema: -; Owner: postgres