diff --git a/docker/.env.template b/docker/.env.template
index fe0285b..f4e167b 100644
--- a/docker/.env.template
+++ b/docker/.env.template
@@ -1,2 +1 @@
-POSTGRES_USER=event-demo
 PGADMIN_DEFAULT_EMAIL=
\ No newline at end of file
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 568b021..e8b383c 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -32,8 +32,20 @@ services:
       - "traefik.http.routers.redis.rule=Host(`redis.traefik.me`)"
       - "traefik.http.services.redis.loadbalancer.server.port=8001"
 
+  flyway:
+    image: flyway/flyway
+    container_name: "flyway"
+    command: migrate
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    volumes:
+      - ../migrations/events:/flyway/sql
+      - ./flyway.conf:/flyway/conf/flyway.conf
+
   postgresql:
     image: postgres:17.4
+    container_name: "postgresql"
     ports:
       - "5432:5432"
     environment:
@@ -51,6 +63,7 @@ services:
 
   pgadmin:
     image: dpage/pgadmin4
+    container_name: "pgadmin"
     environment:
       PGADMIN_DEFAULT_EMAIL: $PGADMIN_DEFAULT_EMAIL
       PGADMIN_DEFAULT_PASSWORD_FILE: /run/secrets/pgadmin_password
diff --git a/docker/flyway.conf b/docker/flyway.conf
new file mode 100644
index 0000000..0051f9b
--- /dev/null
+++ b/docker/flyway.conf
@@ -0,0 +1,4 @@
+flyway.url=jdbc:postgresql://postgresql:5432/event-demo
+flyway.user=event-demo
+flyway.password=changeit
+flyway.schemas=public
\ No newline at end of file