diff --git a/woodpecker.yaml b/woodpecker.yaml
index b1baa75..8e72b17 100644
--- a/woodpecker.yaml
+++ b/woodpecker.yaml
@@ -9,13 +9,13 @@ services:
       - "9000:9000"  # gRPC (agents communicate here)
     environment:
       # Server configuration
-      WOODPECKER_HOST: https://woodpecker.bryanmail.net
+      WOODPECKER_HOST: https://${WOODPECKER_HOST}
       WOODPECKER_PROTO: https
       WOODPECKER_OPEN: "false"  # Private instance
       
       # Gitea integration
       WOODPECKER_GITEA: "true"
-      WOODPECKER_GITEA_URL: https://git.bryanmail.net
+      WOODPECKER_GITEA_URL: https://${GITEA_HOST}
       WOODPECKER_GITEA_CLIENT: ${WOODPECKER_GITEA_CLIENT}
       WOODPECKER_GITEA_SECRET: ${WOODPECKER_GITEA_SECRET}
       
@@ -30,7 +30,7 @@ services:
       
       # Database (using existing PostgreSQL)
       WOODPECKER_DATABASE_DRIVER: postgres
-      WOODPECKER_DATABASE_DATASOURCE: postgres://${DB_USER}:${DB_PASS}@postgresql:5432/woodpecker?sslmode=disable
+      WOODPECKER_DATABASE_DATASOURCE: postgres://${DB_USER}:${DB_PASS}@${POSTGRES_HOST}:${POSTGRES_PORT}/woodpecker?sslmode=disable
       
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -47,7 +47,7 @@ services:
       labels:
         - traefik.enable=true
         - traefik.http.routers.woodpecker.entrypoints=websecure
-        - "traefik.http.routers.woodpecker.rule=Host(`woodpecker.bryanmail.net`)"
+        - "traefik.http.routers.woodpecker.rule=Host(`${WOODPECKER_HOST}`)"
         - traefik.http.routers.woodpecker.tls=true
         - traefik.http.routers.woodpecker.tls.certresolver=letsencrypt
         - traefik.docker.network=traefik_backend
@@ -77,8 +77,8 @@ services:
       - traefik_backend
     deploy:
       mode: global  # One agent per node
-    depends_on:
-      - woodpecker-server
+  depends_on:
+    - woodpecker-server
 
 networks:
   traefik_backend: