diff --git a/config/docker-compose.yml b/config/docker-compose.yml
index ee29435..31be6b8 100644
--- a/config/docker-compose.yml
+++ b/config/docker-compose.yml
@@ -96,8 +96,8 @@ services:
     container_name: guezoloic-web
     restart: unless-stopped
     environment:
-      - VIRTUAL_HOST=${HOSTNAME_WEBSITE}
-      - LETSENCRYPT_HOST=${HOSTNAME_WEBSITE}
+      - VIRTUAL_HOST=www.${HOSTNAME}
+      - LETSENCRYPT_HOST=${HOSTNAME}
       - LETSENCRYPT_EMAIL=${EMAIL}
     networks:
       - proxy-network
@@ -122,8 +122,8 @@ services:
       - net.ipv6.conf.default.forwarding=1
     environment:
       - TZ=Europe/Paris
-      - VIRTUAL_HOST=${HOSTNAME_VPN}
-      - LETSENCRYPT_HOST=${HOSTNAME_VPN}
+      - VIRTUAL_HOST=vpn.${HOSTNAME}
+      - LETSENCRYPT_HOST=vpn.${HOSTNAME}
       - LETSENCRYPT_EMAIL=${EMAIL}
       - VIRTUAL_PORT=51821
     networks:
@@ -157,8 +157,8 @@ services:
     container_name: grafana
     restart: unless-stopped
     environment:
-      - VIRTUAL_HOST=${HOSTNAME_GRAFANA}
-      - LETSENCRYPT_HOST=${HOSTNAME_GRAFANA}
+      - VIRTUAL_HOST=monitor.${HOSTNAME}
+      - LETSENCRYPT_HOST=monitor.${HOSTNAME}
       - VIRTUAL_PORT=3000
       - LETSENCRYPT_EMAIL=${EMAIL}
     volumes:
diff --git a/scripts/docker-compose.sh b/scripts/docker-compose.sh
index 859b281..9f71d90 100644
--- a/scripts/docker-compose.sh
+++ b/scripts/docker-compose.sh
@@ -9,7 +9,7 @@ if [[ "--install" == $INSTALLED ]]; then
             docker-compose Installation\n\
 --------------------------------------------------"
 
-    ENV_LIST=("EMAIL" "HOSTNAME_VPN" "HOSTNAME_GRAFANA" "HOSTNAME_WEBSITE")
+    ENV_LIST=("EMAIL" "HOSTNAME")
 
     for env in "${ENV_LIST[@]}"; do
         read -p "Enter value for $env: " value