diff --git a/templates/compose/documenso.yaml b/templates/compose/documenso.yaml
index 612c7ce72..dc19c1608 100644
--- a/templates/compose/documenso.yaml
+++ b/templates/compose/documenso.yaml
@@ -62,7 +62,7 @@ services:
         L            = ${CERT_INFO_LOCALITY_NAME}
         O            = ${CERT_INFO_ORGANIZATION_NAME}
         OU           = ${CERT_INFO_ORGANIZATIONAL_UNIT}
-        CN           = ${SERVICE_FQDN_DOCUMENSO}
+        CN           = ${SERVICE_URL_DOCUMENSO}
         emailAddress = ${CERT_INFO_EMAIL}
         EOF
 
diff --git a/templates/compose/homebox.yaml b/templates/compose/homebox.yaml
index 6d3f3e597..feab177dc 100644
--- a/templates/compose/homebox.yaml
+++ b/templates/compose/homebox.yaml
@@ -8,7 +8,7 @@ services:
   homebox:
     image: ghcr.io/sysadminsmedia/homebox:latest
     environment:
-      - SERVICE_FQDN_HOMEBOX_7745
+      - SERVICE_URL_HOMEBOX_7745
       - HBOX_OPTIONS_ALLOW_REGISTRATION=${HBOX_OPTIONS_ALLOW_REGISTRATION:-false}
       - HBOX_LOG_LEVEL=${HBOX_LOG_LEVEL:-info}
       - HBOX_LOG_FORMAT=${HBOX_LOG_FORMAT:-text}
diff --git a/templates/compose/librechat.yaml b/templates/compose/librechat.yaml
index fcb8f8c6d..1c4b59618 100644
--- a/templates/compose/librechat.yaml
+++ b/templates/compose/librechat.yaml
@@ -8,9 +8,9 @@ services:
   librechat:
     image: ghcr.io/danny-avila/librechat-dev-api:latest
     environment:
-      - SERVICE_FQDN_LIBRECHAT_3080
-      - DOMAIN_CLIENT=${SERVICE_FQDN_LIBRECHAT}
-      - DOMAIN_SERVER=${SERVICE_FQDN_LIBRECHAT}
+      - SERVICE_URL_LIBRECHAT_3080
+      - DOMAIN_CLIENT=${SERVICE_URL_LIBRECHAT}
+      - DOMAIN_SERVER=${SERVICE_URL_LIBRECHAT}
       - HOST=0.0.0.0
       - PORT=3080
       - MONGO_URI=mongodb://${SERVICE_USER_MONGO}:${SERVICE_PASSWORD_MONGO}@mongodb:27017/librechat?authSource=admin
diff --git a/templates/compose/pterodactyl-with-wings.yaml b/templates/compose/pterodactyl-with-wings.yaml
index bd0c07cca..aec18c866 100644
--- a/templates/compose/pterodactyl-with-wings.yaml
+++ b/templates/compose/pterodactyl-with-wings.yaml
@@ -71,7 +71,7 @@ services:
       timeout: 1s
       retries: 3
     environment:
-      - SERVICE_FQDN_PTERODACTYL_80
+      - SERVICE_URL_PTERODACTYL_80
       - ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
       - ADMIN_USERNAME=${SERVICE_USER_ADMIN}
       - ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-Admin}
@@ -80,7 +80,7 @@ services:
       - PTERODACTYL_HTTPS=${PTERODACTYL_HTTPS:-false}
       - APP_ENV=production
       - APP_ENVIRONMENT_ONLY=false
-      - APP_URL=$SERVICE_FQDN_PTERODACTYL
+      - APP_URL=$SERVICE_URL_PTERODACTYL
       - APP_TIMEZONE=${TIMEZONE:-UTC}
       - APP_SERVICE_AUTHOR=${APP_SERVICE_AUTHOR:-author@example.com}
       - LOG_LEVEL=${LOG_LEVEL:-debug}
@@ -104,7 +104,7 @@ services:
   wings:
     image: "ghcr.io/pterodactyl/wings:latest"
     environment:
-      - SERVICE_FQDN_WINGS_8443
+      - SERVICE_URL_WINGS_8443
       - "TZ=${TIMEZONE:-UTC}"
       - WINGS_USERNAME=$SERVICE_USER_WINGS
     volumes:
diff --git a/templates/compose/pterodactyl.yaml b/templates/compose/pterodactyl.yaml
index 3b77ce78d..13708ec28 100644
--- a/templates/compose/pterodactyl.yaml
+++ b/templates/compose/pterodactyl.yaml
@@ -71,7 +71,7 @@ services:
       timeout: 1s
       retries: 3
     environment:
-      - SERVICE_FQDN_PTERODACTYL_80
+      - SERVICE_URL_PTERODACTYL_80
       - ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
       - ADMIN_USERNAME=${SERVICE_USER_ADMIN}
       - ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-Admin}
@@ -80,7 +80,7 @@ services:
       - PTERODACTYL_HTTPS=${PTERODACTYL_HTTPS:-false}
       - APP_ENV=production
       - APP_ENVIRONMENT_ONLY=false
-      - APP_URL=$SERVICE_FQDN_PTERODACTYL
+      - APP_URL=$SERVICE_URL_PTERODACTYL
       - APP_TIMEZONE=${TIMEZONE:-UTC}
       - APP_SERVICE_AUTHOR=${APP_SERVICE_AUTHOR:-author@example.com}
       - LOG_LEVEL=${LOG_LEVEL:-debug}
diff --git a/templates/compose/wings.yaml b/templates/compose/wings.yaml
index ce4a073f8..7a3c198a1 100644
--- a/templates/compose/wings.yaml
+++ b/templates/compose/wings.yaml
@@ -8,7 +8,7 @@ services:
   wings:
     image: "ghcr.io/pterodactyl/wings:latest"
     environment:
-      - SERVICE_FQDN_WINGS_8443
+      - SERVICE_URL_WINGS_8443
       - "TZ=${TIMEZONE:-UTC}"
       - WINGS_USERNAME=$SERVICE_USER_WINGS
     volumes: