diff --git a/.env.example b/.env.example
index 02d7585..0571388 100644
--- a/.env.example
+++ b/.env.example
@@ -50,7 +50,7 @@ DBFILTER=.*
 # PgBouncer
 POOL_MODE=transaction
 MAX_CLIENT_CONN=500
-ADMIN_USERS=postgres,dbuser,odoo
+ADMIN_USERS=postgres,odoo
 
 # Logging
 LOG_LEVEL=info
diff --git a/docker-compose.override.local.yml b/docker-compose.override.local.yml
index e77024f..e34ed7e 100644
--- a/docker-compose.override.local.yml
+++ b/docker-compose.override.local.yml
@@ -14,8 +14,8 @@ services:
 
   pgbouncer:
     restart: 'no'
-    ports:
-      - 5432:5432
+    expose:
+      - 5432/tcp
 
   nginx:
     restart: 'no'
diff --git a/docker-compose.override.production.yml b/docker-compose.override.production.yml
index b67a7c9..7055efa 100644
--- a/docker-compose.override.production.yml
+++ b/docker-compose.override.production.yml
@@ -14,8 +14,8 @@ services:
 
   pgbouncer:
     restart: unless-stopped
-    ports:
-      - 127.0.0.1=5432:5432
+    expose:
+      - 5432/tcp
 
   nginx:
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 7dfcca6..4a01494 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,14 +88,14 @@ services:
     container_name: pgbouncer
     restart: always
     depends_on:
-      - db
+      - postgres
     environment:
-      - DB_HOST=db
-      - DB_USER=odoo
-      - DB_PASSWORD=odoo
-      - MAX_CLIENT_CONN=500
-      - POOL_MODE=transaction
-      - ADMIN_USERS=postgres,dbuser,odoo
+      - DB_HOST=${DB_HOST}
+      - DB_USER=${DB_USER}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - MAX_CLIENT_CONN=${MAX_CLIENT_CONN}
+      - POOL_MODE=${POOL_MODE}
+      - ADMIN_USERS=${ADMIN_USERS}
     profiles: [$PGBOUNCER_PROFILES]
 
   nginx: