diff --git a/compose/.apps/gluetun/gluetun.env b/compose/.apps/gluetun/gluetun.env
index a98e59df26..6b6d080324 100644
--- a/compose/.apps/gluetun/gluetun.env
+++ b/compose/.apps/gluetun/gluetun.env
@@ -1,58 +1,60 @@
+
+# Control server options
+HTTP_CONTROL_SERVER_LOG='on'
+
+# DNS options
+
+# Firewall options
 FIREWALL_DEBUG='off'
 FIREWALL_INPUT_PORTS=''
 FIREWALL_OUTBOUND_SUBNETS=''
 FIREWALL_VPN_INPUT_PORTS=''
 
-FREE_ONLY=''
-
-HTTP_CONTROL_SERVER_LOG='on'
+# Healthcheck options
+# HTTP proxy options
 
+# HTTP proxy options
 HTTPPROXY='off'
 HTTPPROXY_LOG='off'
 HTTPPROXY_PASSWORD=''
 HTTPPROXY_STEALTH='off'
 HTTPPROXY_USER=''
 
-ISP=''
-
+# OpenVPN options
 OPENVPN_CUSTOM_CONFIG='/gluetun/custom.conf'
 OPENVPN_PASSWORD=''
 OPENVPN_USER=''
 
-OWNED_ONLY='no'
-
-PREMIUM_ONLY='no'
-
-PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET='strong'
+# Other Options
 PUBLICIP_FILE='/tmp/gluetun/ip'
 PUBLICIP_PERIOD='12h'
+VERSION_INFORMATION='on'
 
-SERVER_CITIES=''
-SERVER_COUNTRIES=''
-SERVER_HOSTNAMES=''
-SERVER_NAMES=''
-SERVER_REGIONS=''
+# VPN server port forwarding options
+VPN_PORT_FORWARDING='off'
+VPN_PORT_FORWARDING_PROVIDER=''
+VPN_PORT_FORWARDING_STATUS_FILE='/tmp/gluetun/forwarded_port'
 
+# Shadowsocks options
 SHADOWSOCKS='off'
 SHADOWSOCKS_CIPHER='chacha20-ietf-poly1305'
 SHADOWSOCKS_LOG='off'
 SHADOWSOCKS_PASSWORD=''
 
+# Storage options
+
+
+# Servers updater options
 UPDATER_MIN_RATIO='0.8'
 UPDATER_PERIOD=''
 UPDATER_VPN_SERVICE_PROVIDERS=''
 
-VERSION_INFORMATION='on'
-
-VPN_ENDPOINT_IP=''
-VPN_ENDPOINT_PORT=''
+# VPN options
 VPN_INTERFACE='tun0'
-VPN_PORT_FORWARDING='off'
-VPN_PORT_FORWARDING_PROVIDER=''
-VPN_PORT_FORWARDING_STATUS_FILE='/tmp/gluetun/forwarded_port'
 VPN_SERVICE_PROVIDER='private internet access'
 VPN_TYPE='openvpn'
 
+# Wireguard options
 WIREGUARD_ADDRESSES=''
 WIREGUARD_ALLOWED_IPS='0.0.0.0/0,::/0'
 WIREGUARD_IMPLEMENTATION='auto'
@@ -60,3 +62,24 @@ WIREGUARD_MTU='1400'
 WIREGUARD_PRESHARED_KEY=''
 WIREGUARD_PRIVATE_KEY=''
 WIREGUARD_PUBLIC_KEY=''
+
+
+FREE_ONLY=''
+
+ISP=''
+
+OWNED_ONLY='no'
+
+PREMIUM_ONLY='no'
+
+PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET='strong'
+
+SERVER_CITIES=''
+SERVER_COUNTRIES=''
+SERVER_HOSTNAMES=''
+SERVER_NAMES=''
+SERVER_REGIONS=''
+
+VPN_ENDPOINT_IP=''
+VPN_ENDPOINT_PORT=''
+