diff --git a/stacks/woodpecker.yml b/stacks/woodpecker.yml
index 01e1e06..6b78d80 100644
--- a/stacks/woodpecker.yml
+++ b/stacks/woodpecker.yml
@@ -21,7 +21,7 @@ services:
       - 'WOODPECKER_OPEN=true'
       - 'WOODPECKER_HOST=https://ci.rustybever.be'
       - 'WOODPECKER_DATABASE_DRIVER=postgres'
-      - 'WOODPECKER_DATABASE_DATASOURCE=postgres://root:woodpecker@db:5432/woodpecker?sslmode=disable'
+      - 'WOODPECKER_DATABASE_DATASOURCE=postgres://woodpecker:woodpecker@db:5432/woodpecker?sslmode=disable'
       - 'WOODPECKER_AGENT_SECRET_FILE=/run/secrets/woodpecker_agent_secret'
       - 'WOODPECKER_GITEA=true'
       - 'WOODPECKER_GITEA_URL=https://git.rustybever.be'
@@ -46,14 +46,14 @@ services:
           - 'node.labels.class==admin'
 
     healthcheck:
-      test: pg_isready
+      test: pg_isready -U woodpecker -d woodpecker
       interval: 30s 
       timeout: 5s
       retries: 3
       start_period: 15s
 
     environment:
-      - 'POSTGRES_USER=root'
+      - 'POSTGRES_USER=woodpecker'
       - 'POSTGRES_PASSWORD=woodpecker'
       - 'POSTGRES_DB=woodpecker'
     volumes: