diff --git a/doc/development.md b/doc/development.md
index cf89e06..5f9dbdf 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -74,13 +74,13 @@ docker build -t danielgrams/gsevpt:latest .
 ### Run container with existing postgres server
 
 ```sh
-docker run -p 5000:5000 -e "DATABASE_URL=postgresql://postgres@localhost/gsevpt" "gsevpt:latest"
+docker run -p 5000:5000 -e "DATABASE_URL=postgresql://postgres@host.docker.internal/gsevpt" danielgrams/gsevpt:latest
 ```
 
-### Compose (including Postgres server)
+### Compose (including dependencies)
 
 ```sh
-docker-compose build && docker-compose up
+docker-compose up --build
 ```
 
 ## Celery
diff --git a/docker-compose.yml b/docker-compose.yml
index 1992db5..20545f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ name: "oveda-dev"
 x-web-env:
   &default-web-env
   FLASK_APP: main.py
-  DATABASE_URL: postgresql://user:pass@db/gsevpt
+  DATABASE_URL: postgresql://gsevpt:pass@db/gsevpt
   REDIS_URL: redis://default:pass@redis
   MAIL_DEFAULT_SENDER: noresponse@gsevpt.de
   MAIL_SERVER: mailhog
@@ -32,11 +32,11 @@ services:
   db:
     image: postgis/postgis:12-3.1
     healthcheck:
-      test: "pg_isready --username=user && psql --username=user --list"
+      test: "pg_isready --username=gsevpt && psql --username=gsevpt --list"
       start_period: "5s"
     environment:
       - POSTGRES_DB=gsevpt
-      - POSTGRES_USER=user
+      - POSTGRES_USER=gsevpt
       - POSTGRES_PASSWORD=pass
 
   redis:
diff --git a/entrypoint.sh b/entrypoint.sh
index 4417401..79acb44 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,16 +5,14 @@ if [[ ! -z "${STATIC_FILES_MIRROR}" ]]; then
     rsync -a --delete project/static/ "${STATIC_FILES_MIRROR}"
 fi
 
-echo "Using redis ${REDIS_URL}"
-
-PONG=`redis-cli -u ${REDIS_URL} ping | grep PONG`
-while [ -z "$PONG" ]; do
-    sleep 2
-    echo "Waiting for redis server ${REDIS_URL} to become available..."
+if [[ ! -z "${REDIS_URL}" ]]; then
     PONG=`redis-cli -u ${REDIS_URL} ping | grep PONG`
-done
-
-echo "Using database server ${DATABASE_URL}"
+    while [ -z "$PONG" ]; do
+        sleep 2
+        echo "Waiting for redis server to become available..."
+        PONG=`redis-cli -u ${REDIS_URL} ping | grep PONG`
+    done
+fi
 
 until flask db upgrade
 do