diff --git a/compose.override.yaml b/compose.override.yaml
index 555f5ba..cb7a3d5 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -11,10 +11,7 @@ services:
       - ./docker/frankenphp/Caddyfile:/etc/caddy/Caddyfile:ro
       - ./docker/frankenphp/conf.d/app.dev.ini:/usr/local/etc/php/conf.d/app.dev.ini:ro
     environment:
-      MERCURE_EXTRA_DIRECTIVES: demo
-      # See https://xdebug.org/docs/all_settings#mode
-      XDEBUG_MODE: "${XDEBUG_MODE:-off}"
-      TRUSTED_HOSTS: ^${SERVER_NAME:-project-manager\.localhost|localhost}|php$$
+      SERVER_NAME: ${SERVER_NAME:-project-manager\.localhost}, php:80
       DATABASE_URL: postgresql://user:password@database:5432/db_name?serverVersion=15&charset=${POSTGRES_CHARSET:-utf8}
       POSTGRES_DB: db_name
     extra_hosts:
diff --git a/compose.yaml b/compose.yaml
index 9362a22..b5d7c1a 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,17 +1,12 @@
-version: "3.4"
-
 services:
   php:
     image: ${IMAGES_PREFIX:-}app-php
     restart: unless-stopped
     environment:
-      SERVER_NAME: ${SERVER_NAME:-project-manager.localhost}, php:80
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       TRUSTED_PROXIES: ${TRUSTED_PROXIES:-127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16}
       TRUSTED_HOSTS: ^${SERVER_NAME:-project-manager\.localhost|localhost}|php$$
-      DATABASE_URL: postgresql://user:password@database:5432/db_name?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8}
-      POSTGRES_DB: db_name
       MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
       MERCURE_PUBLIC_URL: https://${SERVER_NAME:-project-manager\.localhost}/.well-known/mercure
       MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}