diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 2820b37..a8f4d5d 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -17,6 +17,6 @@ COPY . .
 RUN pip install --no-cache-dir -e .
 
 # Run migrations then start the application
-# COPY docker/entrypoint.sh /entrypoint.sh
-# ENTRYPOINT ["/entrypoint.sh"]
+COPY docker/entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9dd0a3d..5f8dec6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -38,6 +38,8 @@ services:
     container_name: squirrel-api
     command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
     environment:
+      RUN_MIGRATIONS: "true"  # Dev only - run migrations manually in prod
+
       SQUIRREL_DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
       SQUIRREL_REDIS_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
       SQUIRREL_DEBUG: "${SQUIRREL_DEBUG}"
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 24b6a70..7a0e68b 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
-alembic upgrade head
+if [ "${RUN_MIGRATIONS:-false}" = "true" ]; then
+    alembic upgrade head
+fi
 
 exec "$@"