diff --git a/docker-compose.yml b/docker-compose.yml
index 2e82793..df41a84 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 services:
   frontend:
     build:
-      context: .
-      dockerfile: ./Dockerfile
+      context: ./
+      dockerfile: ./docker/app.Dockerfile
     environment:
       - PORT=${WEB_PORT}
     ports:
@@ -14,9 +14,13 @@ services:
       - ./tsconfig.json:/app/tsconfig.json
       - ./svelte.config.js:/app/svelte.config.js
   db:
-    image: postgres:16
+    build: 
+      context: ./
+      dockerfile: ./docker/postgres.Dockerfile
     environment:
       - POSTGRES_PASSWORD=${PG_PASS}
+      - POSTGRES_USER=${PG_USER}
+      - POSTGRES_DB=${PG_DB}
     ports:
       - ${PG_PORT}:5432
     volumes:
diff --git a/Dockerfile b/docker/app.Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/app.Dockerfile
diff --git a/docker/initdb.d/user-db.sql b/docker/initdb.d/user-db.sql
new file mode 100644
index 0000000..e69de29
diff --git a/docker/postgres.Dockerfile b/docker/postgres.Dockerfile
new file mode 100644
index 0000000..4caffc2
--- /dev/null
+++ b/docker/postgres.Dockerfile
@@ -0,0 +1,3 @@
+FROM postgres:16
+
+COPY ./docker/initdb.d/ /docker-entrypoint-initdb.d/
\ No newline at end of file