diff --git a/templates/compose/pgbackweb.yaml b/templates/compose/pgbackweb.yaml
index 67701814a..4c006a6ce 100644
--- a/templates/compose/pgbackweb.yaml
+++ b/templates/compose/pgbackweb.yaml
@@ -3,6 +3,7 @@
 # tags: backup, postgresql, web-interface
 # logo: svgs/pgbackweb.svg
 # port: 8085
+
 services:
   pgbackweb:
     image: eduardolat/pgbackweb:latest
@@ -11,26 +12,23 @@ services:
     environment:
       - SERVICE_FQDN_PGBACKWEB_8085
       - PBW_ENCRYPTION_KEY=${SERVICE_PASSWORD_64_PGBACKWEB}
-      - PBW_POSTGRES_CONN_STRING=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/pgbackweb?sslmode=disable
+      - PBW_POSTGRES_CONN_STRING=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-pgbackweb-db}?sslmode=disable
       - TZ=${TIME_ZONE:-UTC}
     depends_on:
       postgres:
         condition: service_healthy
     exclude_from_hc: true
+
   postgres:
     image: postgres:17
     environment:
       - POSTGRES_USER=${SERVICE_USER_POSTGRES}
-      - POSTGRES_DB=pgbackweb
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-pgbackweb-db}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - pgbackweb_postgres_data:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${SERVICE_USER_POSTGRES} -d pgbackweb"]
       interval: 5s
       timeout: 5s
       retries: 5
-
-volumes:
-  postgres_data:
-  pgbackweb_backups: