diff --git a/Dockerfile.vaultwarden b/Dockerfile.vaultwarden
deleted file mode 100644
index 1b78562..0000000
--- a/Dockerfile.vaultwarden
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM vaultwarden/server:latest
-
-# This is a placeholder - the actual PostgreSQL support should be built into the image
-# The latest image should support PostgreSQL by default
-# If not, we would need to build from source with DB=postgresql
-
-ENV DATABASE_URL=postgresql://vaultwarden:vaultwarden123@postgres_postgres:5432/vaultwarden
-ENV DATA_FOLDER=/data
diff --git a/stacks/apps/postgres.yml b/stacks/apps/postgres.yml
index 5855b2e..86c0551 100644
--- a/stacks/apps/postgres.yml
+++ b/stacks/apps/postgres.yml
@@ -5,13 +5,10 @@ services:
     image: postgres:15-alpine
     environment:
       POSTGRES_DB: vaultwarden
-      POSTGRES_USER_FILE: /run/secrets/postgres_user
-      POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
+      POSTGRES_USER: vaultwarden
+      POSTGRES_PASSWORD: vaultwarden123
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    secrets:
-      - postgres_user
-      - postgres_password
     networks:
       - caddy-public
     deploy:
@@ -19,16 +16,14 @@ services:
         constraints:
           - "node.labels.role==db"
       replicas: 1
+      labels:
+        - "traefik.enable=false"
 
 volumes:
   postgres_data:
     driver: local
 
-secrets:
-  postgres_user:
-    external: true
-  postgres_password:
-    external: true
+# Removed secrets section since we're using direct environment variables
 
 networks:
   caddy-public:
diff --git a/stacks/apps/vaultwarden.yml b/stacks/apps/vaultwarden.yml
index c89f31e..2a9ca41 100644
--- a/stacks/apps/vaultwarden.yml
+++ b/stacks/apps/vaultwarden.yml
@@ -26,17 +26,24 @@ services:
       IP_HEADER: 'X-Real-IP'
       TRUSTED_PROXIES: '192.168.50.0/24'
       # Use PostgreSQL instead of SQLite for NFS compatibility
-      DATABASE_URL_FILE: /run/secrets/vaultwarden_database_url
+      DATABASE_URL: postgresql://vaultwarden:vaultwarden123@postgres:5432/vaultwarden
       # Disable WAL to prevent filesystem compatibility issues
       ENABLE_DB_WAL: 'false'
       # Ensure data folder is properly set
       DATA_FOLDER: '/data'
+      # Enable debug logging to troubleshoot connection issues
+      LOG_LEVEL: 'debug'
+      # Force database URL validation
+      DATABASE_MAX_CONNS: '10'
+    depends_on:
+      - postgres
+    volumes:
+      - vaultwarden_data:/data
 
     secrets:
       - smtp_user
       - smtp_pass
       - vaultwarden_admin_token
-      - vaultwarden_database_url
 
     networks:
       - caddy-public
@@ -63,8 +70,6 @@ secrets:
     external: true
   vaultwarden_admin_token:
     external: true
-  vaultwarden_database_url:
-    external: true
 
 networks:
   caddy-public: