diff --git a/.github/workflows/docker-compose-test.yml b/.github/workflows/compose-test.yaml
similarity index 93%
rename from .github/workflows/docker-compose-test.yml
rename to .github/workflows/compose-test.yaml
index 3ea883e..625ae55 100644
--- a/.github/workflows/docker-compose-test.yml
+++ b/.github/workflows/compose-test.yaml
@@ -55,7 +55,7 @@ jobs:
         working-directory: /var/www/app
 
       - name: Copy required content
-        run: sudo cp -R FrankenPHP.Dockerfile docker-compose.production.yml Makefile .env.production .dockerignore deployment/ /var/www/app/
+        run: sudo cp -R FrankenPHP.Dockerfile compose.production.yaml Makefile .env.production .dockerignore deployment/ /var/www/app/
 
       - name: Prepare the environment
         run: sudo mkdir -p storage/framework/{sessions,views,cache,testing} storage/logs && sudo chmod -R a+rw storage
diff --git a/FrankenPHP.Alpine.Dockerfile b/FrankenPHP.Alpine.Dockerfile
index a8589ab..b6bab86 100644
--- a/FrankenPHP.Alpine.Dockerfile
+++ b/FrankenPHP.Alpine.Dockerfile
@@ -36,7 +36,6 @@ ARG WWWGROUP=1000
 ARG TZ=UTC
 ARG APP_DIR=/var/www/html
 ARG APP_ENV
-ARG APP_HOST
 
 ENV TERM=xterm-color \
     OCTANE_SERVER=frankenphp \
@@ -47,8 +46,7 @@ ENV TERM=xterm-color \
     COMPOSER_FUND=0 \
     COMPOSER_MAX_PARALLEL_HTTP=24 \
     XDG_CONFIG_HOME=${APP_DIR}/.config \
-    XDG_DATA_HOME=${APP_DIR}/.data \
-    SERVER_NAME=${APP_HOST}
+    XDG_DATA_HOME=${APP_DIR}/.data
 
 WORKDIR ${ROOT}
 
diff --git a/FrankenPHP.Dockerfile b/FrankenPHP.Dockerfile
index a1fcc96..7f30ac1 100644
--- a/FrankenPHP.Dockerfile
+++ b/FrankenPHP.Dockerfile
@@ -36,7 +36,6 @@ ARG WWWGROUP=1000
 ARG TZ=UTC
 ARG APP_DIR=/var/www/html
 ARG APP_ENV
-ARG APP_HOST
 
 ENV DEBIAN_FRONTEND=noninteractive \
     TERM=xterm-color \
@@ -48,8 +47,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     COMPOSER_FUND=0 \
     COMPOSER_MAX_PARALLEL_HTTP=24 \
     XDG_CONFIG_HOME=${APP_DIR}/.config \
-    XDG_DATA_HOME=${APP_DIR}/.data \
-    SERVER_NAME=${APP_HOST}
+    XDG_DATA_HOME=${APP_DIR}/.data
 
 WORKDIR ${ROOT}
 
diff --git a/Makefile b/Makefile
index 7a2acf5..5394402 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile readme (en): <https://www.gnu.org/software/make/manual/html_node/index.html#SEC_Contents>
 
 SHELL = /bin/bash
-DC_RUN_ARGS = --env-file ./.env.production --profile app --profile administration -f docker-compose.production.yml
+DC_RUN_ARGS = --env-file ./.env.production --profile app --profile administration -f compose.production.yaml
 HOST_UID=$(shell id -u)
 HOST_GID=$(shell id -g)
 
diff --git a/README.md b/README.md
index cf4c381..6ec63e3 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
  <a href="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/tests.yml"><img alt="GitHub Workflow Status" src="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/roadrunner-test.yml/badge.svg"></a>
  <a href="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/tests.yml"><img alt="GitHub Workflow Status" src="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/swoole-test.yml/badge.svg"></a>
  <a href="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/tests.yml"><img alt="GitHub Workflow Status" src="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/frankenphp-test.yml/badge.svg"></a>
- <a href="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/tests.yml"><img alt="GitHub Workflow Status" src="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/docker-compose-test.yml/badge.svg"></a>
+ <a href="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/tests.yml"><img alt="GitHub Workflow Status" src="https://github.com/exaco/laravel-octane-dockerfile/actions/workflows/compose-test.yaml/badge.svg"></a>
 </div>
 <br>
 
@@ -24,7 +24,7 @@ The setup is optimized for performance and includes multi-stage builds to create
 - **Multi-Stage Builds:** Creates smaller, more secure Docker images by separating build dependencies from the final runtime image.
 - **Container Modes:** Easily run your container in different modes for handling web requests (`http`), queues (`horizon`), scheduled tasks (`scheduler`), custom worker (`worker`), or WebSocket server (`reverb`).
 - **Extensible:** Simple to customize for your specific application needs.
-- **Comprehensive Docker Compose:** Includes a production-ready `docker-compose.production.yml` to orchestrate the full application stack.
+- **Comprehensive Docker Compose:** Includes a production-ready `compose.production.yaml` to orchestrate the full application stack.
 
 
 ## Laravel Container modes
@@ -42,7 +42,7 @@ Easily launch your container in different modes to handle specific tasks:
 
 ## Production-Ready Docker Compose
 
-For a complete production environment, this repository includes a `docker-compose.production.yml` file to orchestrate a full stack of services. This setup is security-hardened and provides a comprehensive solution for deploying and managing your application.
+For a complete production environment, this repository includes a `compose.production.yaml` file to orchestrate a full stack of services. This setup is security-hardened and provides a comprehensive solution for deploying and managing your application.
 
 The orchestrated containers include:
 
@@ -137,7 +137,7 @@ docker run --rm <image-name>:<tag> php artisan about
 
 To deploy your application stack with Docker Compose:
 1. Copy the following items to your code base:
-    - `docker-compose.production.yml`
+    - `compose.production.yaml`
     - `.env.production`
     - `Makefile`
 2. Edit `.env.production` and populate it with the appropriate values for your production environment variables (e.g., database credentials, API keys).
diff --git a/docker-compose.production.yml b/compose.production.yaml
similarity index 99%
rename from docker-compose.production.yml
rename to compose.production.yaml
index ef93edf..61875ca 100644
--- a/docker-compose.production.yml
+++ b/compose.production.yaml
@@ -20,7 +20,6 @@ x-base: &base
       - 'laravel/app:latest'
     args:
       APP_ENV: 'production' # to load .env.production
-      APP_HOST: '${APP_HOST}'
       WWWUSER: ${HOST_UID:-1000}
       WWWGROUP: ${HOST_GID:-1000}
   image: 'laravel/app:latest'
@@ -238,7 +237,7 @@ services:
       docker-volume-backup.stop-during-backup: true
       docker-volume-backup.archive-pre: /bin/sh -c 'pg_dump -U ${DB_USERNAME} -F t ${DB_DATABASE} > /backup/${DB_DATABASE}-database.tar'
   pgbouncer:
-    image: bitnami/pgbouncer:1
+    image: bitnamilegacy/pgbouncer:latest
     restart: unless-stopped
     logging: *default-logging
     depends_on:
diff --git a/static-build.Dockerfile b/static-build.Dockerfile
index 8c963a8..5312d0b 100644
--- a/static-build.Dockerfile
+++ b/static-build.Dockerfile
@@ -36,7 +36,6 @@ ARG WWWGROUP=1000
 ARG TZ=UTC
 ARG APP_DIR=/var/www/html
 ARG APP_ENV
-ARG APP_HOST
 
 ENV DEBIAN_FRONTEND=noninteractive \
     TERM=xterm-color \
@@ -48,8 +47,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     COMPOSER_FUND=0 \
     COMPOSER_MAX_PARALLEL_HTTP=24 \
     XDG_CONFIG_HOME=${APP_DIR}/.config \
-    XDG_DATA_HOME=${APP_DIR}/.data \
-    SERVER_NAME=${APP_HOST}
+    XDG_DATA_HOME=${APP_DIR}/.data
 
 WORKDIR ${ROOT}