chore: Update misc integrations files to use the new stack

2026-05-24 09:28:37 +00:00 · 2024-06-25 11:28:30 +01:00 · 2024-06-25 11:28:30 +01:00 · e66aea1e14
commit e66aea1e14
parent d4dc3da384
29 changed files with 998 additions and 1128 deletions
--- a/.gitleaksignore
+++ b/.gitleaksignore
@ -18,3 +18,31 @@ src/deps/src/lua-resty-openssl/lib/resty/openssl/pkey.lua:generic-api-key:438
 src/deps/src/lua-resty-openssl/lib/resty/openssl/pkey.lua:generic-api-key:439
 src/deps/src/lua-resty-openssl/lib/resty/openssl/pkey.lua:generic-api-key:440
 src/deps/src/lua-resty-openssl/lib/resty/openssl/pkey.lua:generic-api-key:441
+misc/integrations/autoconf.mariadb.ui.yml:hashicorp-tf-password:57
+misc/integrations/autoconf.mariadb.ui.yml:hashicorp-tf-password:73
+misc/integrations/autoconf.mariadb.yml:hashicorp-tf-password:55
+misc/integrations/autoconf.mysql.ui.yml:hashicorp-tf-password:57
+misc/integrations/autoconf.mysql.ui.yml:hashicorp-tf-password:73
+misc/integrations/autoconf.mysql.yml:hashicorp-tf-password:50
+misc/integrations/autoconf.mysql.yml:hashicorp-tf-password:55
+misc/integrations/autoconf.postgres.ui.yml:hashicorp-tf-password:57
+misc/integrations/autoconf.postgres.ui.yml:hashicorp-tf-password:71
+misc/integrations/autoconf.postgres.yml:hashicorp-tf-password:53
+misc/integrations/docker.mariadb.ui.yml:hashicorp-tf-password:50
+misc/integrations/docker.mariadb.ui.yml:hashicorp-tf-password:61
+misc/integrations/docker.mariadb.yml:hashicorp-tf-password:39
+misc/integrations/docker.mysql.ui.yml:hashicorp-tf-password:50
+misc/integrations/docker.mysql.ui.yml:hashicorp-tf-password:61
+misc/integrations/docker.mysql.yml:hashicorp-tf-password:39
+misc/integrations/docker.postgres.ui.yml:hashicorp-tf-password:49
+misc/integrations/docker.postgres.ui.yml:hashicorp-tf-password:58
+misc/integrations/docker.postgres.yml:hashicorp-tf-password:37
+misc/integrations/swarm.mariadb.ui.yml:hashicorp-tf-password:68
+misc/integrations/swarm.mariadb.ui.yml:hashicorp-tf-password:88
+misc/integrations/swarm.mariadb.yml:hashicorp-tf-password:69
+misc/integrations/swarm.mysql.ui.yml:hashicorp-tf-password:68
+misc/integrations/swarm.mysql.ui.yml:hashicorp-tf-password:88
+misc/integrations/swarm.mysql.yml:hashicorp-tf-password:69
+misc/integrations/swarm.postgres.ui.yml:hashicorp-tf-password:68
+misc/integrations/swarm.postgres.ui.yml:hashicorp-tf-password:86
+misc/integrations/swarm.postgres.yml:hashicorp-tf-password:67
--- a/misc/integrations/autoconf.mariadb.ui.yml
+++ b/misc/integrations/autoconf.mariadb.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,61 +23,38 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: mariadb:10.10
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    networks:
-      bw-docker:
-      bw-universe:
-        aliases:
-          - bw-ui
+      - bw-universe
+      - bw-db
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=changeme
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    labels:
      - "bunkerweb.SERVER_NAME=www.example.com"
      - "bunkerweb.USE_UI=yes"
@ -88,8 +64,31 @@ services:
      - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
      - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: mariadb:11
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -102,3 +101,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.mariadb.yml
+++ b/misc/integrations/autoconf.mariadb.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,50 +23,54 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
+
+  bw-db:
+    image: mariadb:11
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db

  bw-docker:
    image: tecnativa/docker-socket-proxy:nightly
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: mariadb:10.10
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
    networks:
      - bw-docker

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -80,3 +83,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.mysql.ui.yml
+++ b/misc/integrations/autoconf.mysql.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,61 +23,38 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: mysql:8.0
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    networks:
-      bw-docker:
-      bw-universe:
-        aliases:
-          - bw-ui
+      - bw-universe
+      - bw-db
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    labels:
      - "bunkerweb.SERVER_NAME=www.example.com"
      - "bunkerweb.USE_UI=yes"
@ -88,8 +64,31 @@ services:
      - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
      - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: mysql:8
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -102,3 +101,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.mysql.yml
+++ b/misc/integrations/autoconf.mysql.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,50 +23,54 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
+
+  bw-db:
+    image: mysql:8
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db

  bw-docker:
    image: tecnativa/docker-socket-proxy:nightly
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: mysql:8.0
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
    networks:
      - bw-docker

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -80,3 +83,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.postgres.ui.yml
+++ b/misc/integrations/autoconf.postgres.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,60 +23,38 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: postgres:15.1
-    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme
-      - POSTGRES_DB=db
-    volumes:
-      - bw-data:/var/lib/postgresql/data
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    networks:
-      bw-docker:
-      bw-universe:
-        aliases:
-          - bw-ui
+      - bw-universe
+      - bw-db
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=changeme
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    labels:
      - "bunkerweb.SERVER_NAME=www.example.com"
      - "bunkerweb.USE_UI=yes"
@ -87,8 +64,30 @@ services:
      - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
      - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
+    volumes:
+      - bw-db:/var/lib/postgresql/data
+    networks:
+      - bw-db
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -101,3 +100,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.postgres.yml
+++ b/misc/integrations/autoconf.postgres.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database
+  AUTOCONF_MODE: "yes"

 services:
  bunkerweb:
@ -9,11 +11,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -24,49 +23,53 @@ services:
      - bunkerweb
      - bw-docker
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
+
+  bw-db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
+    volumes:
+      - bw-db:/var/lib/postgresql/data
+    networks:
+      - bw-db

  bw-docker:
    image: tecnativa/docker-socket-proxy:nightly
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-db:
-    image: postgres:15.1
-    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme
-      - POSTGRES_DB=db
-    volumes:
-      - bw-data:/var/lib/postgresql/data
+      CONTAINERS: "1"
+      LOG_LEVEL: "warning"
    networks:
      - bw-docker

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -79,3 +82,5 @@ networks:
    name: bw-services
  bw-docker:
    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/autoconf.ui.yml
+++ b/misc/integrations/autoconf.ui.yml
@ -1,94 +0,0 @@
-version: "3.5"
-
-services:
-  bunkerweb:
-    image: bunkerity/bunkerweb:1.6.0-beta
-    ports:
-      - 80:8080
-      - 443:8443
-    labels:
-      - "bunkerweb.INSTANCE=yes"
-    environment:
-      - SERVER_NAME=
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-    networks:
-      - bw-universe
-      - bw-services
-
-  bw-autoconf:
-    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
-    depends_on:
-      - bunkerweb
-      - bw-docker
-    volumes:
-      - bw-data:/data
-    environment:
-      - AUTOCONF_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-scheduler:
-    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
-    depends_on:
-      - bunkerweb
-      - bw-docker
-    volumes:
-      - bw-data:/data
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-ui:
-    image: bunkerity/bunkerweb-ui:1.6.0-beta
-    networks:
-      bw-docker:
-      bw-universe:
-        aliases:
-          - bw-ui
-    volumes:
-      - bw-data:/data
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=changeme
-    labels:
-      - "bunkerweb.SERVER_NAME=www.example.com"
-      - "bunkerweb.USE_UI=yes"
-      - "bunkerweb.USE_REVERSE_PROXY=yes"
-      - "bunkerweb.REVERSE_PROXY_URL=/changeme"
-      - "bunkerweb.REVERSE_PROXY_HOST=http://bw-ui:7000"
-      - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
-      - "bunkerweb.MAX_CLIENT_SIZE=50m"
-
-volumes:
-  bw-data:
-
-networks:
-  bw-universe:
-    name: bw-universe
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.20.30.0/24
-  bw-services:
-    name: bw-services
-  bw-docker:
-    name: bw-docker
--- a/misc/integrations/autoconf.yml
+++ b/misc/integrations/autoconf.yml
@ -1,71 +0,0 @@
-version: "3.5"
-
-services:
-  bunkerweb:
-    image: bunkerity/bunkerweb:1.6.0-beta
-    ports:
-      - 80:8080
-      - 443:8443
-    labels:
-      - "bunkerweb.INSTANCE=yes"
-    environment:
-      - SERVER_NAME=
-      - AUTOCONF_MODE=yes
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-    networks:
-      - bw-universe
-      - bw-services
-
-  bw-autoconf:
-    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
-    depends_on:
-      - bunkerweb
-      - bw-docker
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-    volumes:
-      - bw-data:/data
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-scheduler:
-    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
-    depends_on:
-      - bunkerweb
-      - bw-docker
-    volumes:
-      - bw-data:/data
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-volumes:
-  bw-data:
-
-networks:
-  bw-universe:
-    name: bw-universe
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.20.30.0/24
-  bw-services:
-    name: bw-services
-  bw-docker:
-    name: bw-docker
--- a/misc/integrations/docker.mariadb.ui.yml
+++ b/misc/integrations/docker.mariadb.ui.yml
@ -1,4 +1,5 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database

 services:
  bunkerweb:
@ -9,19 +10,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - MULTISITE=yes
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-      - DISABLE_DEFAULT_SERVER=yes
-      - USE_CLIENT_CACHE=yes
-      - USE_GZIP=yes
-      - www.example.com_USE_UI=yes
-      - www.example.com_USE_REVERSE_PROXY=yes
-      - www.example.com_REVERSE_PROXY_URL=/changeme
-      - www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
-      - www.example.com_INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504
-      - www.example.com_MAX_CLIENT_SIZE=50m
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -30,51 +20,53 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      MULTISITE: "yes"
+      SERVE_FILES: "no"
+      DISABLE_DEFAULT_SERVER: "yes"
+      USE_CLIENT_CACHE: "yes"
+      USE_GZIP: "yes"
+      www.example.com_USE_UI: "yes"
+      www.example.com_USE_REVERSE_PROXY: "yes"
+      www.example.com_REVERSE_PROXY_URL: "/changeme"
+      www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
+      www.example.com_INTERCEPTED_ERROR_CODES: "400 404 405 413 429 500 501 502 503 504"
+      www.example.com_MAX_CLIENT_SIZE: "50m"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
-    depends_on:
-      - bw-docker
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme # Remember to set a stronger password for the changeme user
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db

  bw-db:
-    image: mariadb:10.10
+    image: mariadb:11
    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme # Remember to set a stronger password for the database
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
    volumes:
-      - bw-data:/var/lib/mysql
+      - bw-db:/var/lib/mysql
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -85,5 +77,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.mariadb.yml
+++ b/misc/integrations/docker.mariadb.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"

 services:
  bunkerweb:
@ -9,9 +11,7 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
    networks:
      - bw-universe
      - bw-services
@ -20,38 +20,31 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-db:
-    image: mariadb:10.10
+    image: mariadb:11
    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme # Remember to set a stronger password for the database
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
    volumes:
-      - bw-data:/var/lib/mysql
+      - bw-db:/var/lib/mysql
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -62,5 +55,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.mysql.ui.yml
+++ b/misc/integrations/docker.mysql.ui.yml
@ -1,4 +1,5 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database

 services:
  bunkerweb:
@ -9,19 +10,8 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - MULTISITE=yes
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-      - DISABLE_DEFAULT_SERVER=yes
-      - USE_CLIENT_CACHE=yes
-      - USE_GZIP=yes
-      - www.example.com_USE_UI=yes
-      - www.example.com_USE_REVERSE_PROXY=yes
-      - www.example.com_REVERSE_PROXY_URL=/changeme
-      - www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
-      - www.example.com_INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504
-      - www.example.com_MAX_CLIENT_SIZE=50m
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -30,51 +20,53 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      MULTISITE: "yes"
+      SERVE_FILES: "no"
+      DISABLE_DEFAULT_SERVER: "yes"
+      USE_CLIENT_CACHE: "yes"
+      USE_GZIP: "yes"
+      www.example.com_USE_UI: "yes"
+      www.example.com_USE_REVERSE_PROXY: "yes"
+      www.example.com_REVERSE_PROXY_URL: "/changeme"
+      www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
+      www.example.com_INTERCEPTED_ERROR_CODES: "400 404 405 413 429 500 501 502 503 504"
+      www.example.com_MAX_CLIENT_SIZE: "50m"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
-    depends_on:
-      - bw-docker
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=changeme # Remember to set a stronger password for the admin user
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db

  bw-db:
-    image: mysql:8.0
+    image: mysql:8
    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme # Remember to set a stronger password for the database
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
    volumes:
-      - bw-data:/var/lib/mysql
+      - bw-db:/var/lib/mysql
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -85,5 +77,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.mysql.yml
+++ b/misc/integrations/docker.mysql.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"

 services:
  bunkerweb:
@ -9,9 +11,7 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
    networks:
      - bw-universe
      - bw-services
@ -20,38 +20,31 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-db:
-    image: mysql:8.0
+    image: mysql:8
    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme # Remember to set a stronger password for the database
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
    volumes:
-      - bw-data:/var/lib/mysql
+      - bw-db:/var/lib/mysql
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -62,5 +55,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.postgres.ui.yml
+++ b/misc/integrations/docker.postgres.ui.yml
@ -1,4 +1,5 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database

 services:
  bunkerweb:
@ -9,20 +10,7 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - MULTISITE=yes
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-      - DISABLE_DEFAULT_SERVER=yes
-      - USE_CLIENT_CACHE=yes
-      - USE_GZIP=yes
-      - www.example.com_USE_UI=yes
-      - www.example.com_SERVE_FILES=no
-      - www.example.com_USE_REVERSE_PROXY=yes
-      - www.example.com_REVERSE_PROXY_URL=/changeme
-      - www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
-      - www.example.com_INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504
-      - www.example.com_MAX_CLIENT_SIZE=50m
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -31,50 +19,52 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      MULTISITE: "yes"
+      SERVE_FILES: "no"
+      DISABLE_DEFAULT_SERVER: "yes"
+      USE_CLIENT_CACHE: "yes"
+      USE_GZIP: "yes"
+      www.example.com_USE_UI: "yes"
+      www.example.com_USE_REVERSE_PROXY: "yes"
+      www.example.com_REVERSE_PROXY_URL: "/changeme"
+      www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
+      www.example.com_INTERCEPTED_ERROR_CODES: "400 404 405 413 429 500 501 502 503 504"
+      www.example.com_MAX_CLIENT_SIZE: "50m"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
-    depends_on:
-      - bw-docker
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=changeme # Remember to set a stronger password for the admin user
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db

  bw-db:
-    image: postgres:15.1
+    image: postgres:16-alpine
    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme # Remember to set a stronger password for the database
-      - POSTGRES_DB=db
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
    volumes:
-      - bw-data:/var/lib/postgresql/data
+      - bw-db:/var/lib/postgresql/data
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -85,5 +75,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.postgres.yml
+++ b/misc/integrations/docker.postgres.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database
+  API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"

 services:
  bunkerweb:
@ -9,9 +11,7 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
    networks:
      - bw-universe
      - bw-services
@ -20,37 +20,30 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
+    volumes:
+      - bw-data:/data
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db

  bw-db:
-    image: postgres:15.1
+    image: postgres:16-alpine
    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme # Remember to set a stronger password for the database
-      - POSTGRES_DB=db
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
    volumes:
-      - bw-data:/var/lib/postgresql/data
+      - bw-db:/var/lib/postgresql/data
    networks:
-      - bw-docker
+      - bw-db

 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -61,5 +54,5 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
+  bw-db:
+    name: bw-db
--- a/misc/integrations/docker.ui.yml
+++ b/misc/integrations/docker.ui.yml
@ -1,75 +0,0 @@
-version: "3.5"
-
-services:
-  bunkerweb:
-    image: bunkerity/bunkerweb:1.6.0-beta
-    ports:
-      - 80:8080
-      - 443:8443
-    labels:
-      - "bunkerweb.INSTANCE=yes"
-    environment:
-      - SERVER_NAME=www.example.com
-      - MULTISITE=yes
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
-      - www.example.com_USE_UI=yes
-      - www.example.com_USE_REVERSE_PROXY=yes
-      - www.example.com_REVERSE_PROXY_URL=/changeme
-      - www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
-      - www.example.com_INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504
-      - www.example.com_MAX_CLIENT_SIZE=50m
-    networks:
-      - bw-universe
-      - bw-services
-
-  bw-scheduler:
-    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
-    depends_on:
-      - bunkerweb
-      - bw-docker
-    volumes:
-      - bw-data:/data
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-
-  bw-ui:
-    image: bunkerity/bunkerweb-ui:1.6.0-beta
-    depends_on:
-      - bw-docker
-    volumes:
-      - bw-data:/data
-    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme
-    networks:
-      - bw-universe
-      - bw-docker
-
-volumes:
-  bw-data:
-
-networks:
-  bw-universe:
-    name: bw-universe
-    ipam:
-      driver: default
-      config:
-        - subnet: 10.20.30.0/24
-  bw-services:
-    name: bw-services
-  bw-docker:
-    name: bw-docker
--- a/misc/integrations/docker.yml
+++ b/misc/integrations/docker.yml
@ -1,4 +1,5 @@
-version: "3.5"
+x-env: &env
+  API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"

 services:
  bunkerweb:
@ -9,8 +10,7 @@ services:
    labels:
      - "bunkerweb.INSTANCE=yes"
    environment:
-      - SERVER_NAME=www.example.com
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
    networks:
      - bw-universe
      - bw-services
@ -19,24 +19,14 @@ services:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    depends_on:
      - bunkerweb
-      - bw-docker
    volumes:
      - bw-data:/data
    environment:
-      - DOCKER_HOST=tcp://bw-docker:2375
+      <<: *env
+      BUNKERWEB_INSTANCES: "bunkerweb"
+      SERVER_NAME: "www.example.com"
    networks:
      - bw-universe
-      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONTAINERS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker

 volumes:
  bw-data:
@ -50,5 +40,3 @@ networks:
        - subnet: 10.20.30.0/24
  bw-services:
    name: bw-services
-  bw-docker:
-    name: bw-docker
--- a/misc/integrations/k8s.mariadb.ui.yml
+++ b/misc/integrations/k8s.mariadb.ui.yml
@ -63,25 +63,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -150,8 +134,25 @@ spec:
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -192,7 +193,7 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: mariadb:10.10
+          image: mariadb:11
          imagePullPolicy: Always
          env:
            - name: MYSQL_RANDOM_ROOT_PASSWORD
@ -233,14 +234,14 @@ spec:
          image: bunkerity/bunkerweb-ui:1.6.0-beta
          imagePullPolicy: Always
          env:
-            - name: ADMIN_USERNAME
-              value: "changeme"
-            - name: "ADMIN_PASSWORD"
-              value: "changeme"
            - name: KUBERNETES_MODE
              value: "YES"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
+            - name: ADMIN_USERNAME
+              value: "changeme"
+            - name: ADMIN_PASSWORD
+              value: "changeme"
 ---
 apiVersion: v1
 kind: Service
--- a/misc/integrations/k8s.mariadb.yml
+++ b/misc/integrations/k8s.mariadb.yml
@ -74,25 +74,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -161,8 +145,25 @@ spec:
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -203,7 +204,7 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: mariadb:10.10
+          image: mariadb:11
          imagePullPolicy: Always
          env:
            - name: MYSQL_RANDOM_ROOT_PASSWORD
--- a/misc/integrations/k8s.mysql.ui.yml
+++ b/misc/integrations/k8s.mysql.ui.yml
@ -63,25 +63,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -150,8 +134,25 @@ spec:
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -192,7 +193,7 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: mysql:8.0
+          image: mysql:8
          imagePullPolicy: Always
          env:
            - name: MYSQL_RANDOM_ROOT_PASSWORD
@ -233,14 +234,14 @@ spec:
          image: bunkerity/bunkerweb-ui:1.6.0-beta
          imagePullPolicy: Always
          env:
-            - name: ADMIN_USERNAME
-              value: "changeme"
-            - name: "ADMIN_PASSWORD"
-              value: "changeme"
            - name: KUBERNETES_MODE
              value: "YES"
-            - name: "DATABASE_URI"
-              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+            - name: DATABASE_URI
+              value: "mysql+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
+            - name: ADMIN_USERNAME
+              value: "changeme"
+            - name: ADMIN_PASSWORD
+              value: "changeme"
 ---
 apiVersion: v1
 kind: Service
@ -303,6 +304,7 @@ spec:
  resources:
    requests:
      storage: 5Gi
+  volumeName: pv-bunkerweb
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
--- a/misc/integrations/k8s.mysql.yml
+++ b/misc/integrations/k8s.mysql.yml
@ -1,3 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-bunkerweb
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@ -63,25 +74,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -142,15 +137,33 @@ spec:
      labels:
        app: bunkerweb-scheduler
    spec:
+      serviceAccountName: sa-bunkerweb
      containers:
-        - name: bunkerweb-controller
-          image: bunkerity/bunkerweb-autoconf:1.6.0-beta
+        - name: bunkerweb-scheduler
+          image: bunkerity/bunkerweb-scheduler:1.6.0-beta
          imagePullPolicy: Always
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -191,7 +204,7 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: mysql:8.0
+          image: mysql:8
          imagePullPolicy: Always
          env:
            - name: MYSQL_RANDOM_ROOT_PASSWORD
@ -246,14 +259,3 @@ spec:
      protocol: TCP
      port: 6379
      targetPort: 6379
---
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: pvc-bunkerweb
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
--- a/misc/integrations/k8s.postgres.ui.yml
+++ b/misc/integrations/k8s.postgres.ui.yml
@ -63,25 +63,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -150,8 +134,25 @@ spec:
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -192,16 +193,16 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: postgres:15.1
+          image: postgres:16-alpine
          imagePullPolicy: Always
          env:
-            - name: "POSTGRES_DB"
+            - name: POSTGRES_DB
              value: "db"
-            - name: "POSTGRES_USER"
+            - name: POSTGRES_USER
              value: "bunkerweb"
-            - name: "POSTGRES_PASSWORD"
+            - name: POSTGRES_PASSWORD
              value: "changeme"
-            - name: "PGDATA"
+            - name: PGDATA
              value: "/var/lib/postgresql/data/pgdata"
          volumeMounts:
            - mountPath: "/var/lib/postgresql/data"
@ -233,14 +234,14 @@ spec:
          image: bunkerity/bunkerweb-ui:1.6.0-beta
          imagePullPolicy: Always
          env:
-            - name: ADMIN_USERNAME
-              value: "changeme"
-            - name: "ADMIN_PASSWORD"
-              value: "changeme"
            - name: KUBERNETES_MODE
              value: "YES"
-            - name: "DATABASE_URI"
-              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
+            - name: DATABASE_URI
+              value: "mysql+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
+            - name: ADMIN_USERNAME
+              value: "changeme"
+            - name: ADMIN_PASSWORD
+              value: "changeme"
 ---
 apiVersion: v1
 kind: Service
@ -303,6 +304,7 @@ spec:
  resources:
    requests:
      storage: 5Gi
+  volumeName: pv-bunkerweb
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
--- a/misc/integrations/k8s.postgres.yml
+++ b/misc/integrations/k8s.postgres.yml
@ -1,3 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-bunkerweb
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@ -63,25 +74,9 @@ spec:
            - containerPort: 8443
              hostPort: 443
          env:
-            - name: KUBERNETES_MODE
-              value: "yes"
-            # replace with your DNS resolvers
-            # e.g. : kube-dns.kube-system.svc.cluster.local
-            - name: DNS_RESOLVERS
-              value: "coredns.kube-system.svc.cluster.local"
-            - name: USE_API
-              value: "yes"
            # 10.0.0.0/8 is the cluster internal subnet
            - name: API_WHITELIST_IP
              value: "127.0.0.0/8 10.0.0.0/8"
-            - name: SERVER_NAME
-              value: ""
-            - name: MULTISITE
-              value: "yes"
-            - name: USE_REDIS
-              value: "yes"
-            - name: REDIS_HOST
-              value: "svc-bunkerweb-redis.default.svc.cluster.local"
          livenessProbe:
            exec:
              command:
@ -142,15 +137,33 @@ spec:
      labels:
        app: bunkerweb-scheduler
    spec:
+      serviceAccountName: sa-bunkerweb
      containers:
-        - name: bunkerweb-controller
-          image: bunkerity/bunkerweb-autoconf:1.6.0-beta
+        - name: bunkerweb-scheduler
+          image: bunkerity/bunkerweb-scheduler:1.6.0-beta
          imagePullPolicy: Always
          env:
            - name: KUBERNETES_MODE
              value: "yes"
-            - name: "DATABASE_URI"
+            - name: DATABASE_URI
              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
+            # replace with your DNS resolvers
+            # e.g. : kube-dns.kube-system.svc.cluster.local
+            - name: DNS_RESOLVERS
+              value: "coredns.kube-system.svc.cluster.local"
+            # 10.0.0.0/8 is the cluster internal subnet
+            - name: API_WHITELIST_IP
+              value: "127.0.0.0/8 10.0.0.0/8"
+            - name: BUNKERWEB_INSTANCES
+              value: ""
+            - name: SERVER_NAME
+              value: ""
+            - name: MULTISITE
+              value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis.default.svc.cluster.local"
 ---
 apiVersion: apps/v1
 kind: Deployment
@ -191,16 +204,16 @@ spec:
    spec:
      containers:
        - name: bunkerweb-db
-          image: postgres:15.1
+          image: postgres:16-alpine
          imagePullPolicy: Always
          env:
-            - name: "POSTGRES_DB"
+            - name: POSTGRES_DB
              value: "db"
-            - name: "POSTGRES_USER"
+            - name: POSTGRES_USER
              value: "bunkerweb"
-            - name: "POSTGRES_PASSWORD"
+            - name: POSTGRES_PASSWORD
              value: "changeme"
-            - name: "PGDATA"
+            - name: PGDATA
              value: "/var/lib/postgresql/data/pgdata"
          volumeMounts:
            - mountPath: "/var/lib/postgresql/data"
@ -246,14 +259,3 @@ spec:
      protocol: TCP
      port: 6379
      targetPort: 6379
---
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: pvc-bunkerweb
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
--- a/misc/integrations/swarm.mariadb.ui.yml
+++ b/misc/integrations/swarm.mariadb.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,68 +31,44 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
-          - "node.role == manager"
+          - "node.role == worker"

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-db:
-    image: mariadb:10.10
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
-    networks:
-      - bw-docker
-
-  bw-redis:
-    image: redis:7-alpine
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
    networks:
      - bw-universe
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme # Remember to set a stronger password for the changeme user
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme" # Remember to set a stronger password for the changeme user
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
    deploy:
      labels:
        - "bunkerweb.SERVER_NAME=www.example.com"
@ -106,8 +79,52 @@ services:
        - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
        - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: mariadb:11
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-redis:
+    image: redis:7-alpine
+    networks:
+      - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == manager"
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -125,3 +142,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true
--- a/misc/integrations/swarm.mariadb.yml
+++ b/misc/integrations/swarm.mariadb.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,60 +31,46 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
          - "node.role == worker"

-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
-    deploy:
-      placement:
-        constraints:
-          - "node.role == manager"
-
  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
          - "node.role == worker"

  bw-db:
-    image: mariadb:10.10
+    image: mariadb:11
    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
    volumes:
-      - bw-data:/var/lib/mysql
+      - bw-db:/var/lib/mysql
    networks:
-      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
@ -102,8 +85,27 @@ services:
        constraints:
          - "node.role == worker"

+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == manager"
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -121,3 +123,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true
--- a/misc/integrations/swarm.mysql.ui.yml
+++ b/misc/integrations/swarm.mysql.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,68 +31,44 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
-          - "node.role == manager"
+          - "node.role == worker"

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-db:
-    image: mysql:8.0
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
-    networks:
-      - bw-docker
-
-  bw-redis:
-    image: redis:7-alpine
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
    networks:
      - bw-universe
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    environment:
-      - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme # Remember to set a stronger password for the changeme user
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme" # Remember to set a stronger password for the changeme user
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
    deploy:
      labels:
        - "bunkerweb.SERVER_NAME=www.example.com"
@ -106,8 +79,52 @@ services:
        - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
        - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: mysql:8
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-redis:
+    image: redis:7-alpine
+    networks:
+      - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == manager"
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -125,3 +142,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true
--- a/misc/integrations/swarm.mysql.yml
+++ b/misc/integrations/swarm.mysql.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "mysql+pymysql://bunkerweb:changeme@bw-db:3306/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,24 +31,71 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-scheduler:
+    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
+    environment:
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
+    networks:
+      - bw-universe
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-db:
+    image: mysql:8
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: "db"
+      MYSQL_USER: "bunkerweb"
+      MYSQL_PASSWORD: "changeme" # Remember to set a stronger password for the database
+    volumes:
+      - bw-db:/var/lib/mysql
+    networks:
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-redis:
+    image: redis:7-alpine
+    networks:
+      - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"

  bw-docker:
    image: tecnativa/docker-socket-proxy:nightly
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
    networks:
      - bw-docker
    deploy:
@ -59,35 +103,9 @@ services:
        constraints:
          - "node.role == manager"

-  bw-scheduler:
-    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
-    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-db:
-    image: mysql:8.0
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_DATABASE=db
-      - MYSQL_USER=bunkerweb
-      - MYSQL_PASSWORD=changeme
-    volumes:
-      - bw-data:/var/lib/mysql
-    networks:
-      - bw-docker
-
-  bw-redis:
-    image: redis:7-alpine
-    networks:
-      - bw-universe
-
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -105,3 +123,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true
--- a/misc/integrations/swarm.postgres.ui.yml
+++ b/misc/integrations/swarm.postgres.ui.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,67 +31,44 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
-
-  bw-docker:
-    image: tecnativa/docker-socket-proxy:nightly
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
-    networks:
-      - bw-docker
+      - bw-db
    deploy:
      placement:
        constraints:
-          - "node.role == manager"
+          - "node.role == worker"

  bw-scheduler:
    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-db:
-    image: postgres:15.1
-    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme
-      - POSTGRES_DB=db
-    volumes:
-      - bw-data:/var/lib/postgresql/data
-    networks:
-      - bw-docker
-
-  bw-redis:
-    image: redis:7-alpine
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
    networks:
      - bw-universe
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"

  bw-ui:
    image: bunkerity/bunkerweb-ui:1.6.0-beta
    environment:
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - ADMIN_USERNAME=changeme
-      - ADMIN_PASSWORD=changeme
+      <<: *env
+      ADMIN_USERNAME: "changeme"
+      ADMIN_PASSWORD: "changeme" # Remember to set a stronger password for the changeme user
    networks:
      - bw-universe
-      - bw-docker
+      - bw-db
    deploy:
      labels:
        - "bunkerweb.SERVER_NAME=www.example.com"
@ -105,8 +79,51 @@ services:
        - "bunkerweb.INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504"
        - "bunkerweb.MAX_CLIENT_SIZE=50m"

+  bw-db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
+    volumes:
+      - bw-db:/var/lib/postgresql/data
+    networks:
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-redis:
+    image: redis:7-alpine
+    networks:
+      - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-docker:
+    image: tecnativa/docker-socket-proxy:nightly
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
+    networks:
+      - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == manager"
+
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -124,3 +141,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true
--- a/misc/integrations/swarm.postgres.yml
+++ b/misc/integrations/swarm.postgres.yml
@ -1,4 +1,6 @@
-version: "3.5"
+x-env: &env
+  DATABASE_URI: "postgresql://bunkerweb:changeme@bw-db:5432/db" # Remember to set a stronger password for the database
+  SWARM_MODE: "yes"

 services:
  bunkerweb:
@ -13,13 +15,8 @@ services:
        mode: host
        protocol: tcp
    environment:
-      - SERVER_NAME=
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-      - SWARM_MODE=yes
-      - MULTISITE=yes
-      - USE_REDIS=yes
-      - REDIS_HOST=bw-redis
-      - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
+      <<: *env
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
    networks:
      - bw-universe
      - bw-services
@ -34,24 +31,70 @@ services:
  bw-autoconf:
    image: bunkerity/bunkerweb-autoconf:1.6.0-beta
    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
+      <<: *env
+      DOCKER_HOST: "tcp://bw-docker:2375"
    networks:
      - bw-universe
      - bw-docker
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-scheduler:
+    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
+    environment:
+      <<: *env
+      BUNKERWEB_INSTANCES: ""
+      SERVER_NAME: ""
+      MULTISITE: "yes"
+      API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
+      USE_REDIS: "yes"
+      REDIS_HOST: "bw-redis"
+    networks:
+      - bw-universe
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: "bunkerweb"
+      POSTGRES_PASSWORD: "changeme" # Remember to set a stronger password for the database
+      POSTGRES_DB: "db"
+    volumes:
+      - bw-db:/var/lib/postgresql/data
+    networks:
+      - bw-db
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
+
+  bw-redis:
+    image: redis:7-alpine
+    networks:
+      - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"

  bw-docker:
    image: tecnativa/docker-socket-proxy:nightly
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
-      - CONFIGS=1
-      - CONTAINERS=1
-      - SERVICES=1
-      - SWARM=1
-      - TASKS=1
-      - LOG_LEVEL=warning
+      CONFIGS: "1"
+      CONTAINERS: "1"
+      SERVICES: "1"
+      SWARM: "1"
+      TASKS: "1"
+      LOG_LEVEL: "warning"
    networks:
      - bw-docker
    deploy:
@ -59,34 +102,9 @@ services:
        constraints:
          - "node.role == manager"

-  bw-scheduler:
-    image: bunkerity/bunkerweb-scheduler:1.6.0-beta
-    environment:
-      - SWARM_MODE=yes
-      - DOCKER_HOST=tcp://bw-docker:2375
-      - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
-    networks:
-      - bw-universe
-      - bw-docker
-
-  bw-db:
-    image: postgres:15.1
-    environment:
-      - POSTGRES_USER=bunkerweb
-      - POSTGRES_PASSWORD=changeme
-      - POSTGRES_DB=db
-    volumes:
-      - bw-data:/var/lib/postgresql/data
-    networks:
-      - bw-docker
-
-  bw-redis:
-    image: redis:7-alpine
-    networks:
-      - bw-universe
-
 volumes:
  bw-data:
+  bw-db:

 networks:
  bw-universe:
@ -104,3 +122,7 @@ networks:
    name: bw-docker
    driver: overlay
    attachable: true
+  bw-db:
+    name: bw-db
+    driver: overlay
+    attachable: true