diff --git a/docker/rinoa.env-example b/docker/rinoa.env-example
index 51a12a2b..ebe9ddd8 100644
--- a/docker/rinoa.env-example
+++ b/docker/rinoa.env-example
@@ -1,4 +1,4 @@
-# Global Settings=''
+# Global Settings
 COMPOSE_HTTP_TIMEOUT=''
 DOCKER_GID=''
 DOCKER_HOSTNAME=''
@@ -7,12 +7,12 @@ DOCKER_VOLUME_STORAGE=''
 PGID=''
 PUID=''
 TZ=''
-=''
-# END OF DEFAULT SETTINGS=''
-=''
-##=''
-## ADDY (User Defined)=''
-##=''
+
+# END OF DEFAULT SETTINGS
+
+##
+## ADDY
+##
 ADDY_ANONADDY_ADDITIONAL_USERNAME_LIMIT=''
 ADDY_ANONADDY_ADMIN_USERNAME=''
 ADDY_ANONADDY_ALL_DOMAINS=''
@@ -43,10 +43,10 @@ ADDY_POSTFIX_SPAMHAUS_DQS_KEY=''
 ADDY_REDIS_PASSWORD=''
 ADDY_RSPAMD_NO_LOCAL_ADDRS=''
 ADDY_RSPAMD_WEB_PASSWORD=''
-=''
-##=''
-## ADGUARD=''
-##=''
+
+##
+## ADGUARD
+##
 ADGUARD_CONTAINER_NAME=''
 ADGUARD_ENABLED=''
 ADGUARD_ENVIRONMENT_SERVERIP=''
@@ -60,55 +60,55 @@ ADGUARD_PORT_80=''
 ADGUARD_PORT_853=''
 ADGUARD_RESTART=''
 ADGUARD_TAG=''
-=''
-##=''
-## ADGUARD (User Defined)=''
-##=''
+
+##
+## ADGUARD
+##
 ADGUARD_CF_TUNNEL_PASSWORD=''
 ADGUARD_PASSWORD=''
-=''
-##=''
-## ANYTHINGLLM (User Defined)=''
-##=''
+
+##
+## ANYTHINGLLM
+##
 ANYTHINGLLM_JWT_SECRET=''
-=''
-##=''
-## APPRISE=''
-##=''
+
+##
+## APPRISE
+##
 APPRISE_CONTAINER_NAME=''
 APPRISE_ENABLED=''
 APPRISE_NETWORK_MODE=''
 APPRISE_PORT_8000=''
 APPRISE_RESTART=''
 APPRISE_TAG=''
-=''
-##=''
-## AUDIOBOOKSHELF=''
-##=''
+
+##
+## AUDIOBOOKSHELF
+##
 AUDIOBOOKSHELF_CONTAINER_NAME=''
 AUDIOBOOKSHELF_ENABLED=''
 AUDIOBOOKSHELF_NETWORK_MODE=''
 AUDIOBOOKSHELF_PORT_80=''
 AUDIOBOOKSHELF_RESTART=''
 AUDIOBOOKSHELF_TAG=''
-=''
-##=''
-## AUDIOBOOKSHELF (User Defined)=''
-##=''
+
+##
+## AUDIOBOOKSHELF
+##
 AUDIOBOOKSHELF_ROOT_API_KEY=''
-=''
-##=''
-## AUTHELIA (User Defined)=''
-##=''
+
+##
+## AUTHELIA
+##
 AUTHELIA_AUTH_BIND_LDAP_PASSWORD=''
 AUTHELIA_JWT_SECRET=''
 AUTHELIA_SESSION_SECRET=''
 AUTHELIA_STORAGE_ENCRYPTION_KEY=''
 AUTHELIA_STORAGE_POSTGRES_PASSWORD=''
-=''
-##=''
-## BAZARR=''
-##=''
+
+##
+## BAZARR
+##
 BAZARR_CONTAINER_NAME=''
 BAZARR_ENABLED=''
 BAZARR_NETWORK_MODE=''
@@ -116,14 +116,14 @@ BAZARR_PORT_6767=''
 BAZARR_RESTART=''
 BAZARR_TAG=''
 BAZARR_API_KEY=''
-##=''
-## BITMAGNET (User Defined)=''
-##=''
+##
+## BITMAGNET
+##
 BITMAGNET_POSTGRESQL_PASSWORD=''
-=''
-##=''
-## BITWARDEN=''
-##=''
+
+##
+## BITWARDEN=
+##
 BITWARDEN_CONTAINER_NAME=''
 BITWARDEN_ENABLED=''
 BITWARDEN_ENVIRONMENT_ADMIN_TOKEN=''
@@ -141,22 +141,22 @@ BITWARDEN_PORT_3012=''
 BITWARDEN_PORT_80=''
 BITWARDEN_RESTART=''
 BITWARDEN_TAG=''
-=''
-##=''
-## CHROMIUM (User Defined)=''
-##=''
+
+##
+## CHROMIUM
+##
 CHROMIUM_TOKEN=''
-=''
-##=''
-## CLOUDFLARE (User Defined)=''
-##=''
+
+##
+## CLOUDFLARE
+##
 CLOUDFLARE_ACCOUNT_ID=''
 CLOUDFLARE_DNS_API_TOKEN=''
 CLOUDFLARE_ZONE_ID=''
-=''
-##=''
-## CLOUDFLAREDDNS=''
-##=''
+
+##
+## CLOUDFLAREDDNS
+##
 CLOUDFLAREDDNS_CONTAINER_NAME=''
 CLOUDFLAREDDNS_ENABLED=''
 CLOUDFLAREDDNS_ENVIRONMENT_APIKEY=''
@@ -171,16 +171,16 @@ CLOUDFLAREDDNS_ENVIRONMENT_USER=''
 CLOUDFLAREDDNS_ENVIRONMENT_ZONES=''
 CLOUDFLAREDDNS_RESTART=''
 CLOUDFLAREDDNS_TAG=''
-=''
-##=''
-## CROWDSEC (User Defined)=''
-##=''
+
+##
+## CROWDSEC
+##
 CROWDSEC_API_KEY=''
 CROWDSEC_LOCAL_API_KEY=''
-=''
-##=''
-## DELUGEVPN=''
-##=''
+
+##
+## DELUGEVPN=
+##
 DELUGEVPN_CONTAINER_NAME=''
 DELUGEVPN_ENABLED=''
 DELUGEVPN_ENVIRONMENT_ENABLE_PRIVOXY=''
@@ -201,17 +201,17 @@ DELUGEVPN_PORT_8112=''
 DELUGEVPN_PORT_8118=''
 DELUGEVPN_RESTART=''
 DELUGEVPN_TAG=''
-=''
-##=''
-## DELUGEVPN (User Defined)=''
-##=''
+
+##
+## DELUGEVPN
+##
 DELUGEVPN_PASSWORD=''
 DELUGEVPN_PORT_51413=''
 DELUGEVPN_PORT_6881=''
-=''
-##=''
-## DUPLICATI=''
-##=''
+
+##
+## DUPLICATI
+##
 DUPLICATI_CONTAINER_NAME=''
 DUPLICATI_ENABLED=''
 DUPLICATI_NETWORK_MODE=''
@@ -220,15 +220,15 @@ DUPLICATI_RESTART=''
 DUPLICATI_TAG=''
 DUPLICATI_VOLUME_BACKUPSDIR=''
 DUPLICATI_VOLUME_SOURCEDIR=''
-=''
-##=''
-## DUPLICATI (User Defined)=''
-##=''
+
+##
+## DUPLICATI
+##
 DUPLICATI_CF_TUNNEL_PASSWORD=''
-=''
-##=''
-## EMBY=''
-##=''
+
+##
+## EMBY
+##
 EMBY_CONTAINER_NAME=''
 EMBY_ENABLED=''
 EMBY_NETWORK_MODE=''
@@ -237,15 +237,15 @@ EMBY_PORT_8920=''
 EMBY_RESTART=''
 EMBY_TAG=''
 EMBY_VOLUME_TRANSCODEDIR=''
-=''
-##=''
-## EMBY (User Defined)=''
-##=''
+
+##
+## EMBY
+##
 EMBY_HOMEPAGE_API_KEY=''
-=''
-##=''
-## FLARESOLVERR=''
-##=''
+
+##
+## FLARESOLVERR
+##
 FLARESOLVERR_CONTAINER_NAME=''
 FLARESOLVERR_ENABLED=''
 FLARESOLVERR_ENVIRONMENT_CAPTCHA_SOLVER=''
@@ -255,33 +255,33 @@ FLARESOLVERR_NETWORK_MODE=''
 FLARESOLVERR_PORT_8191=''
 FLARESOLVERR_RESTART=''
 FLARESOLVERR_TAG=''
-=''
-##=''
-## GHOST (User Defined)=''
-##=''
+
+##
+## GHOST
+##
 GHOST_DB_PASSWORD=''
 GHOST_DB_USER=''
-=''
-##=''
-## GITEA (User Defined)=''
-##=''
+
+##
+## GITEA
+##
 GITEA_HOMEPAGE_API_KEY=''
 GITEA_PG_DB_PASSWORD=''
-=''
-##=''
-## GLUETUN (User Defined)=''
-##=''
+
+##
+## GLUETUN
+##
 GLUETUN_SERVER_REGIONS=''
-=''
-##=''
-## GOTIFY (User Defined)=''
-##=''
+
+##
+## GOTIFY
+##
 GOTIFY_HOMEPAGE_CLIENT_KEY=''
 GOTIFY_PASSWORD=''
-=''
-##=''
-## GRAFANA=''
-##=''
+
+##
+## GRAFANA
+##
 GRAFANA_CONTAINER_NAME=''
 GRAFANA_ENABLED=''
 GRAFANA_ENVIRONMENT_GF_INSTALL_PLUGINS=''
@@ -289,27 +289,27 @@ GRAFANA_NETWORK_MODE=''
 GRAFANA_PORT_3000=''
 GRAFANA_RESTART=''
 GRAFANA_TAG=''
-=''
-##=''
-## GRAFANA (User Defined)=''
-##=''
+
+##
+## GRAFANA
+##
 GRAFANA_ADMIN_PASSWORD=''
 GRAFANA_MIMIR_HTTP_AUTH_PASSWORD=''
-=''
-##=''
-## GUID (User Defined)=''
-##=''
+
+##
+## GUID
+##
 GUID=''
-=''
-##=''
-## HORTUSFOX (User Defined)=''
-##=''
+
+##
+## HORTUSFOX
+##
 HORTUSFOX_ADMIN_PASSWORD=''
 HORTUSFOX_DB_PASSWORD=''
-=''
-##=''
-## HUGINN=''
-##=''
+
+##
+## HUGINN
+##
 HUGINN_CONTAINER_NAME=''
 HUGINN_ENABLED=''
 HUGINN_ENVIRONMENT_DATABASE_HOST=''
@@ -321,23 +321,23 @@ HUGINN_NETWORK_MODE=''
 HUGINN_PORT_3000=''
 HUGINN_RESTART=''
 HUGINN_TAG=''
-=''
-##=''
-## IN (User Defined)=''
-##=''
+
+##
+## IN
+##
 IN_APP_KEY=''
 IN_MYSQL_PASSWORD=''
 IN_PASSWORD=''
-=''
-##=''
-## JAN (User Defined)=''
-##=''
+
+##
+## JAN
+##
 JAN_AI_S3_ACCESS_KEY=''
 JAN_AI_S3_SECRET_KEY=''
-=''
-##=''
-## JITSI (User Defined)=''
-##=''
+
+##
+## JITSI
+##
 JITSI__ADMIN_DB_PASSWORD=''
 JITSI__ADMIN_JWT_SECRET=''
 JITSI__ETHERPAD_DEFAULT_PAD_TEXT=''
@@ -361,10 +361,10 @@ JITSI__PUBLIC_URL=''
 JITSI__SIP_URI=''
 JITSI__TZ=''
 JITSI__WEBSOCKET_SECRET=''
-=''
-##=''
-## JOPLIN (User Defined)=''
-##=''
+
+##
+## JOPLIN
+##
 JOPLIN_APP_BASE_URL=''
 JOPLIN_APP_PORT=''
 JOPLIN_POSTGRES_DATABASE=''
@@ -373,28 +373,28 @@ JOPLIN_POSTGRES_PORT=''
 JOPLIN_POSTGRES_USER=''
 JOPLIN_S3_ACCESS_KEY=''
 JOPLIN_S3_SECRET_KEY=''
-=''
-##=''
-## KEYCLOAK (User Defined)=''
-##=''
+
+##
+## KEYCLOAK
+##
 KEYCLOAK_ADMIN_PASSWORD=''
-=''
-##=''
-## LAN (User Defined)=''
-##=''
+
+##
+## LAN
+##
 LAN_NETWORK=''
-=''
-##=''
-## LASTFM (User Defined)=''
-##=''
+
+##
+## LASTFM
+##
 LASTFM_API_KEY=''
 LASTFM_API_SECRET=''
 LASTFM_PASSWORD=''
 LASTFM_USERNAME=''
-=''
-##=''
-## LIBRESPEED=''
-##=''
+
+##
+## LIBRESPEED
+##
 LIBRESPEED_CONTAINER_NAME=''
 LIBRESPEED_ENABLED=''
 LIBRESPEED_ENVIRONMENT_DB_HOSTNAME=''
@@ -407,41 +407,41 @@ LIBRESPEED_NETWORK_MODE=''
 LIBRESPEED_PORT_80=''
 LIBRESPEED_RESTART=''
 LIBRESPEED_TAG=''
-=''
-##=''
-## LIDARR=''
-##=''
+
+##
+## LIDARR
+##
 LIDARR_CONTAINER_NAME=''
 LIDARR_ENABLED=''
 LIDARR_NETWORK_MODE=''
 LIDARR_PORT_8686=''
 LIDARR_RESTART=''
 LIDARR_TAG=''
-=''
-##=''
-## LIDARR (User Defined)=''
-##=''
+
+##
+## LIDARR
+##
 LIDARR_API_KEY=''
-=''
-##=''
-## LLDAP (User Defined)=''
-##=''
+
+##
+## LLDAP
+##
 LLDAP_JWT_SECRET=''
 LLDAP_KEY_SEED=''
-=''
-##=''
-## LOCALAI (User Defined)=''
-##=''
+
+##
+## LOCALAI
+##
 LOCALAI_API_KEY=''
-=''
-##=''
-## MALOJA (User Defined)=''
-##=''
+
+##
+## MALOJA
+##
 MALOJA_FORCE_PASSWORD=''
-=''
-##=''
-## MARIADB=''
-##=''
+
+##
+## MARIADB
+##
 MARIADB_CONTAINER_NAME=''
 MARIADB_ENABLED=''
 MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD=''
@@ -449,52 +449,52 @@ MARIADB_NETWORK_MODE=''
 MARIADB_PORT_3306=''
 MARIADB_RESTART=''
 MARIADB_TAG=''
-=''
-##=''
-## MATTERMOST (User Defined)=''
-##=''
+
+##
+## MATTERMOST
+##
 MATTERMOST_AWS_S3_ACCESSKEY=''
 MATTERMOST_AWS_S3_SECRETKEY=''
 MATTERMOST_POSTGRES_CONNECTION_URI=''
 MATTERMOST_POSTGRES_PASSWORD=''
-=''
-##=''
-## MAYBE (User Defined)=''
-##=''
+
+##
+## MAYBE
+##
 MAYBE_POSTGRES_PASSWORD=''
 MAYBE_SECRET_KEY_BASE=''
-=''
-##=''
-## MEDUSAJS (User Defined)=''
-##=''
+
+##
+## MEDUSAJS
+##
 MEDUSAJS_COOKIE_SECRET=''
 MEDUSAJS_JWT_TOKEN=''
 MEDUSAJS_POSTGRES_PASSWORD=''
 MEDUSAJS_S3_ACCESS_KEY=''
 MEDUSAJS_S3_SECRET_KEY=''
-=''
-##=''
-## MINIO (User Defined)=''
-##=''
+
+##
+## MINIO
+##
 MINIO_MIMIR_STORAGE_ACCESS_KEY=''
 MINIO_MIMIR_STORAGE_SECRET_KEY=''
 MINIO_ROOT_PASSWORD=''
-=''
-##=''
-## MONGO (User Defined)=''
-##=''
+
+##
+## MONGO
+##
 MONGO_INITDB_ROOT_PASSWORD=''
 MONGO_INITDB_ROOT_USERNAME=''
-=''
-##=''
-## NAVIDROME (User Defined)=''
-##=''
+
+##
+## NAVIDROME
+##
 NAVIDROME_PASSWORD=''
 NAVIDROME_USERNAME=''
-=''
-##=''
-## NEXTCLOUD=''
-##=''
+
+##
+## NEXTCLOUD
+##
 NEXTCLOUD_CONTAINER_NAME=''
 NEXTCLOUD_ENABLED=''
 NEXTCLOUD_NETWORK_MODE=''
@@ -502,10 +502,10 @@ NEXTCLOUD_PORT_443=''
 NEXTCLOUD_RESTART=''
 NEXTCLOUD_TAG=''
 NEXTCLOUD_VOLUME_DATADIR=''
-=''
-##=''
-## OMBI=''
-##=''
+
+##
+## OMBI
+##
 OMBI_CONTAINER_NAME=''
 OMBI_ENABLED=''
 OMBI_NETWORK_MODE=''
@@ -513,28 +513,28 @@ OMBI_PORT_3579=''
 OMBI_RESTART=''
 OMBI_TAG=''
 OMBI_API_KEY=''
-##=''
-## PAPERLESS (User Defined)=''
-##=''
+##
+## PAPERLESS
+##
 PAPERLESS_DBPASS=''
 PAPERLESS_SECRET_KEY=''
-=''
-##=''
-## PLAUSIBLE (User Defined)=''
-##=''
+
+##
+## PLAUSIBLE
+##
 PLAUSIBLE_PG_PASSWORD=''
 PLAUSIBLE_SECRET_KEY_BASE=''
 PLAUSIBLE_TOTP_VAULT_KEY=''
-=''
-##=''
-## PODINDEX (User Defined)=''
-##=''
+
+##
+## PODINDEX
+##
 PODINDEX_API_KEY=''
 PODINDEX_API_SECRET=''
-=''
-##=''
-## PORTAINER=''
-##=''
+
+##
+## PORTAINER
+##
 PORTAINER_CONTAINER_NAME=''
 PORTAINER_ENABLED=''
 PORTAINER_NETWORK_MODE=''
@@ -543,24 +543,24 @@ PORTAINER_RESTART=''
 PORTAINER_TAG=''
 PORTAINER_VOLUME_DOCKER_SOCKET=''
 PORTAINER_API_KEY=''
-=''
-##=''
-## POSTAL (User Defined)=''
-##=''
+
+##
+## POSTAL
+##
 POSTAL_MYSQL_PASSWORD=''
 POSTAL_SMTP_AUTH_PASSWORD=''
 POSTAL_SMTP_AUTH_USER=''
-=''
-##=''
-## POSTGRES (User Defined)=''
-##=''
+
+##
+## POSTGRES
+##
 POSTGRES_HOST=''
 POSTGRES_PASSWORD=''
 POSTGRES_USER=''
-=''
-##=''
-## PROWLARR=''
-##=''
+POSTGRES_VERSION=''
+##
+## PROWLARR
+##
 PROWLARR_CONTAINER_NAME=''
 PROWLARR_ENABLED=''
 PROWLARR_NETWORK_MODE=''
@@ -568,34 +568,34 @@ PROWLARR_PORT_9696=''
 PROWLARR_RESTART=''
 PROWLARR_TAG=''
 PROWLARR_API_KEY=''
-=''
-##=''
-## RADARR=''
-##=''
+
+##
+## RADARR
+##
 RADARR_CONTAINER_NAME=''
 RADARR_ENABLED=''
 RADARR_NETWORK_MODE=''
 RADARR_PORT_7878=''
 RADARR_RESTART=''
 RADARR_TAG=''
-=''
-##=''
-## RADARR (User Defined)=''
-##=''
+
+##
+## RADARR
+##
 RADARR_API_KEY=''
-=''
-##=''
-## REACTIVE (User Defined)=''
-##=''
+
+##
+## REACTIVE
+##
 REACTIVE_RESUME_ACCESS_TOKEN_SECRET=''
 REACTIVE_RESUME_PGSQL_PASSWORD=''
 REACTIVE_RESUME_REFRESH_TOKEN_SECRET=''
 REACTIVE_RESUME_S3_ACCESS_KEY=''
 REACTIVE_RESUME_S3_SECRET_KEY=''
-=''
-##=''
-## READARR=''
-##=''
+
+##
+## READARR
+##
 READARR_CONTAINER_NAME=''
 READARR_ENABLED=''
 READARR_NETWORK_MODE=''
@@ -603,22 +603,22 @@ READARR_PORT_8787=''
 READARR_RESTART=''
 READARR_TAG=''
 READARR_API_KEY=''
-=''
-##=''
-## REMMINA (User Defined)=''
-##=''
+
+##
+## REMMINA
+##
 REMMINA_CF_TUNNEL_ID=''
 REMMINA_CF_TUNNEL_PASSWORD=''
 REMMINA_USER_PASSWORD=''
-=''
-##=''
-## RUSTDESK (User Defined)=''
-##=''
+
+##
+## RUSTDESK
+##
 RUSTDESK_CUSTOM_PASSWORD=''
-=''
-##=''
+
+##
 ## SABNZBDVPN=''
-##=''
+##
 SABNZBDVPN_CONTAINER_NAME=''
 SABNZBDVPN_ENABLED=''
 SABNZBDVPN_ENVIRONMENT_ENABLE_PRIVOXY=''
@@ -639,45 +639,45 @@ SABNZBDVPN_PORT_8118=''
 SABNZBDVPN_RESTART=''
 SABNZBDVPN_TAG=''
 SABNZBDVPN_API_KEY=''
-=''
-##=''
-## SCRAPERR (User Defined)=''
-##=''
+
+##
+## SCRAPERR
+##
 SCRAPERR_SECRET_KEY=''
-=''
-##=''
-## SCRUTINY (User Defined)=''
-##=''
+
+##
+## SCRUTINY
+##
 SCRUTINY_CF_TUNNEL_PASSWORD=''
-=''
-##=''
-## SEARXNG (User Defined)=''
-##=''
+
+##
+## SEARXNG
+##
 SEARXNG_BASE_URL=''
-=''
-##=''
-## SLSKD (User Defined)=''
-##=''
+
+##
+## SLSKD
+##
 SLSKD_PASSWORD=''
-=''
-##=''
+
+##
 ## SONARR=''
-##=''
+##
 SONARR_CONTAINER_NAME=''
 SONARR_ENABLED=''
 SONARR_NETWORK_MODE=''
 SONARR_PORT_8989=''
 SONARR_RESTART=''
 SONARR_TAG=''
-=''
-##=''
-## SONARR (User Defined)=''
-##=''
+
+##
+## SONARR
+##
 SONARR_API_KEY=''
-=''
-##=''
+
+##
 ## SWAG=''
-##=''
+##
 SWAG_CONTAINER_NAME=''
 SWAG_ENABLED=''
 SWAG_ENVIRONMENT_DNSPLUGIN=''
@@ -692,70 +692,70 @@ SWAG_PORT_443=''
 SWAG_PORT_80=''
 SWAG_RESTART=''
 SWAG_TAG=''
-=''
-##=''
-## SWAG (User Defined)=''
-##=''
+
+##
+## SWAG
+##
 SWAG_CF_TUNNEL_ID=''
 SWAG_CF_TUNNEL_PASSWORD=''
 SWAG_DUCKDNSTOKEN=''
 SWAG_MAXMINDDB_LICENSE_KEY=''
-=''
-##=''
-## TANDOOR (User Defined)=''
-##=''
+
+##
+## TANDOOR
+##
 TANDOOR_API_TOKEN=''
 TANDOOR_POSTGRES_PASSWORD=''
 TANDOOR_SECRET_KEY=''
-=''
-##=''
-## TMDB (User Defined)=''
-##=''
+
+##
+## TMDB
+##
 TMDB_API_KEY=''
-=''
-##=''
-## TRACCAR (User Defined)=''
-##=''
+
+##
+## TRACCAR
+##
 TRACCAR_POSTGRES_DATABASE=''
 TRACCAR_POSTGRES_PASSWORD=''
 TRACCAR_POSTGRES_USER=''
-=''
-##=''
-## UPTIME (User Defined)=''
-##=''
+
+##
+## UPTIME
+##
 UPTIME_KUMA_PASSWORD=''
 UPTIME_KUMA_USERNAME=''
-=''
-##=''
+
+##
 ## UPTIMEKUMA=''
-##=''
+##
 UPTIMEKUMA_CONTAINER_NAME=''
 UPTIMEKUMA_ENABLED=''
 UPTIMEKUMA_NETWORK_MODE=''
 UPTIMEKUMA_PORT_3001=''
 UPTIMEKUMA_RESTART=''
 UPTIMEKUMA_TAG=''
-=''
-##=''
-## VAULT (User Defined)=''
-##=''
+
+##
+## VAULT
+##
 VAULT_HASHICORP_AWS_ACCESS_KEY_ID=''
 VAULT_HASHICORP_AWS_SECRET_ACCESS_KEY=''
-=''
-##=''
-## VIRUS (User Defined)=''
-##=''
+
+##
+## VIRUS
+##
 VIRUS_TOTAL_API_KEY=''
-=''
-##=''
-## WALLABAG (User Defined)=''
-##=''
+
+##
+## WALLABAG
+##
 WALLABAG_DB=''
 WALLABAG_DB_PASSWORD=''
-=''
-##=''
+
+##
 ## WATCHTOWER=''
-##=''
+##
 WATCHTOWER_CONTAINER_NAME=''
 WATCHTOWER_ENABLED=''
 WATCHTOWER_ENVIRONMENT_CLEANUP=''
@@ -773,34 +773,34 @@ WATCHTOWER_NETWORK_MODE=''
 WATCHTOWER_RESTART=''
 WATCHTOWER_TAG=''
 WATCHTOWER_VOLUME_DOCKER_SOCKET=''
-=''
-##=''
-## WATCHTOWER (User Defined)=''
-##=''
+
+##
+## WATCHTOWER
+##
 WATCHTOWER_HTTP_API_TOKEN=''
 WATCHTOWER_NOTIFICATION_GOTIFY_TLS_SKIP_VERIFY=''
 WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN=''
 WATCHTOWER_NOTIFICATION_GOTIFY_URL=''
-=''
-##=''
-## WAZUH (User Defined)=''
-##=''
+
+##
+## WAZUH
+##
 WAZUH_API_PASSWORD=''
 WAZUH_INDEXER_PASSWORD=''
 WAZUH_KIBANA_PASSWORD=''
 WAZUH_VERSION=''
-=''
-##=''
-## YOUR (User Defined)=''
-##=''
+
+##
+## YOUR
+##
 YOUR_SPOTIFY_ID=''
 YOUR_SPOTIFY_PORT_443=''
 YOUR_SPOTIFY_PORT_80=''
 YOUR_SPOTIFY_SECRET=''
-=''
-##=''
+
+##
 ## YOUTUBEDL=''
-##=''
+##
 YOUTUBEDL_CONTAINER_NAME=''
 YOUTUBEDL_ENABLED=''
 YOUTUBEDL_ENVIRONMENT_CONFIG_PATH=''
@@ -809,10 +809,10 @@ YOUTUBEDL_NETWORK_MODE=''
 YOUTUBEDL_PORT_8080=''
 YOUTUBEDL_RESTART=''
 YOUTUBEDL_TAG=''
-=''
-##=''
-## ZAMMAD (User Defined)=''
-##=''
+
+##
+## ZAMMAD
+##
 ZAMMAD_ELASTICSEARCH_VERSION=''
 ZAMMAD_IMAGE_REPO=''
 ZAMMAD_MEMCACHE_SERVERS=''