diff --git a/config-templates/dokuwiki/docker-compose.yml b/config-templates/dokuwiki/docker-compose.yml
index c1b3cd4..c6e9a3c 100644
--- a/config-templates/dokuwiki/docker-compose.yml
+++ b/config-templates/dokuwiki/docker-compose.yml
@@ -13,8 +13,8 @@ services:
     volumes:
       - ./config:/config
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       - "homelab.category=productivity"
diff --git a/docker-compose/alternatives/docker-compose.yml b/docker-compose/alternatives/docker-compose.yml
index 115cb41..3377c8e 100644
--- a/docker-compose/alternatives/docker-compose.yml
+++ b/docker-compose/alternatives/docker-compose.yml
@@ -61,8 +61,8 @@ services:
     environment:
       - AUTHENTIK_REDIS__HOST=authentik-redis
       - AUTHENTIK_POSTGRESQL__HOST=authentik-db
-      - AUTHENTIK_POSTGRESQL__USER=${AUTHENTIK_DB_USER:-authentik}
-      - AUTHENTIK_POSTGRESQL__NAME=${AUTHENTIK_DB_NAME:-authentik}
+      - AUTHENTIK_POSTGRESQL__USER=${AUTHENTIK_DB_USER}
+      - AUTHENTIK_POSTGRESQL__NAME=${AUTHENTIK_DB_NAME}
       - AUTHENTIK_POSTGRESQL__PASSWORD=${AUTHENTIK_DB_PASSWORD}
       - AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY}
       - AUTHENTIK_ERROR_REPORTING__ENABLED=false
@@ -98,8 +98,8 @@ services:
     environment:
       - AUTHENTIK_REDIS__HOST=authentik-redis
       - AUTHENTIK_POSTGRESQL__HOST=authentik-db
-      - AUTHENTIK_POSTGRESQL__USER=${AUTHENTIK_DB_USER:-authentik}
-      - AUTHENTIK_POSTGRESQL__NAME=${AUTHENTIK_DB_NAME:-authentik}
+      - AUTHENTIK_POSTGRESQL__USER=${AUTHENTIK_DB_USER}
+      - AUTHENTIK_POSTGRESQL__NAME=${AUTHENTIK_DB_NAME}
       - AUTHENTIK_POSTGRESQL__PASSWORD=${AUTHENTIK_DB_PASSWORD}
       - AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY}
       - AUTHENTIK_ERROR_REPORTING__ENABLED=false
@@ -124,9 +124,9 @@ services:
     volumes:
       - authentik-db-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER=${AUTHENTIK_DB_USER:-authentik}
+      - POSTGRES_USER=${AUTHENTIK_DB_USER}
       - POSTGRES_PASSWORD=${AUTHENTIK_DB_PASSWORD}
-      - POSTGRES_DB=${AUTHENTIK_DB_NAME:-authentik}
+      - POSTGRES_DB=${AUTHENTIK_DB_NAME}
     labels:
       # TRAEFIK CONFIGURATION
       # ==========================================
@@ -134,7 +134,7 @@ services:
       - "homelab.category=alternatives"
       - "homelab.description=Authentik database"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${AUTHENTIK_DB_USER:-authentik}"]
+      test: ["CMD-SHELL", "pg_isready -U ${AUTHENTIK_DB_USER}"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -181,9 +181,9 @@ services:
       - /mnt/media:/media:ro  # Large media files on separate drive
       - plex-transcode:/transcode
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
       - PLEX_CLAIM=${PLEX_CLAIM}
     # Hardware transcoding support
     # Uncomment ONE of the following options:
diff --git a/docker-compose/core/docker-compose.yml b/docker-compose/core/docker-compose.yml
index 03e27a4..114b8ef 100644
--- a/docker-compose/core/docker-compose.yml
+++ b/docker-compose/core/docker-compose.yml
@@ -23,8 +23,8 @@ services:
     container_name: duckdns
     restart: unless-stopped
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - SUBDOMAINS=${DUCKDNS_SUBDOMAINS}
       - TOKEN=${DUCKDNS_TOKEN}
diff --git a/docker-compose/infrastructure/docker-compose.yml b/docker-compose/infrastructure/docker-compose.yml
index d688cde..5b12f43 100644
--- a/docker-compose/infrastructure/docker-compose.yml
+++ b/docker-compose/infrastructure/docker-compose.yml
@@ -75,8 +75,8 @@ services:
       - ./pihole/etc-pihole:/etc/pihole
       - ./pihole/etc-dnsmasq.d:/etc/dnsmasq.d
     environment:
-      - TZ=${TZ:-America/New_York}
-      - WEBPASSWORD=${PIHOLE_PASSWORD:-changeme}
+      - TZ=${TZ}
+      - WEBPASSWORD=${PIHOLE_PASSWORD}
       - FTLCONF_LOCAL_IPV4=${SERVER_IP}
     dns:
       - 127.0.0.1
@@ -116,7 +116,7 @@ services:
       - WATCHTOWER_INCLUDE_RESTARTING=true
       - WATCHTOWER_SCHEDULE=0 0 4 * * *  # 4 AM daily
       - WATCHTOWER_NOTIFICATIONS=shoutrrr
-      - WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL:-}
+      - WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL}
     labels:
       - "homelab.category=infrastructure"
       - "homelab.description=Automatic Docker container updates"
@@ -239,8 +239,8 @@ services:
       - /opt/stacks:/opt/stacks  # Access to all stacks
       - /mnt:/mnt:ro  # Read-only access to data
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - PASSWORD=${CODE_SERVER_PASSWORD}
       - SUDO_PASSWORD=${CODE_SERVER_SUDO_PASSWORD}
diff --git a/docker-compose/media-management/docker-compose.yml b/docker-compose/media-management/docker-compose.yml
index 98c564d..87d2116 100644
--- a/docker-compose/media-management/docker-compose.yml
+++ b/docker-compose/media-management/docker-compose.yml
@@ -37,9 +37,9 @@ services:
       - /mnt/media:/media
       - /mnt/downloads:/downloads # Large downloads on separate drive
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
       # ==========================================
@@ -76,9 +76,9 @@ services:
       - /mnt/media:/media
       - /mnt/downloads:/downloads # Large downloads on separate drive
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
       # ==========================================
@@ -113,9 +113,9 @@ services:
     volumes:
       - ./prowlarr/config:/config
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
       # ==========================================
@@ -152,8 +152,8 @@ services:
       - /mnt/media/books:/books
       - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
@@ -191,8 +191,8 @@ services:
       - /mnt/media/music:/music
       - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
@@ -230,8 +230,8 @@ services:
       - /mnt/media/books:/books
       - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg
     labels:
@@ -270,8 +270,8 @@ services:
       - /mnt/media/comics:/comics
       - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
@@ -362,8 +362,8 @@ services:
       - /mnt/media:/media
       - /mnt/tdarr-transcode:/temp # Transcode cache on separate drive
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - serverIP=0.0.0.0
       - serverPort=8266
@@ -401,8 +401,8 @@ services:
       - /mnt/media:/media
       - /mnt/tdarr-transcode:/temp
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - nodeID=MainNode
       - nodeIP=0.0.0.0
@@ -429,8 +429,8 @@ services:
       - /mnt/media:/library
       - /mnt/unmanic-cache:/tmp/unmanic # Transcode cache on separate drive
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
diff --git a/docker-compose/media/docker-compose.yml b/docker-compose/media/docker-compose.yml
index 033d21c..7854267 100644
--- a/docker-compose/media/docker-compose.yml
+++ b/docker-compose/media/docker-compose.yml
@@ -43,9 +43,9 @@ services:
       - ./jellyfin/cache:/cache
       - /mnt/media:/media:ro  # Large media files on separate drive
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8096/"]
       interval: 30s
@@ -100,9 +100,9 @@ services:
       - ./calibre-web/config:/config
       - /mnt/media/books:/books
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-America/New_York}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
       - DOCKER_MODS=linuxserver/mods:universal-calibre
     # TRAEFIK CONFIGURATION
     labels:
diff --git a/docker-compose/monitoring/docker-compose.yml b/docker-compose/monitoring/docker-compose.yml
index 0c12834..9af3edb 100644
--- a/docker-compose/monitoring/docker-compose.yml
+++ b/docker-compose/monitoring/docker-compose.yml
@@ -92,11 +92,11 @@ services:
       - grafana-data:/var/lib/grafana
       - ./config/grafana/provisioning:/etc/grafana/provisioning
     environment:
-      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD:-admin}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_SERVER_ROOT_URL=https://grafana.${DOMAIN}
       - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource,grafana-piechart-panel
-    user: "${PUID:-1000}:${PGID:-1000}"
+    user: "${PUID}:${PGID}"
     depends_on:
       - prometheus
     labels:
diff --git a/docker-compose/productivity/docker-compose.yml b/docker-compose/productivity/docker-compose.yml
index 8b0d60d..57c7c81 100644
--- a/docker-compose/productivity/docker-compose.yml
+++ b/docker-compose/productivity/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD=${NEXTCLOUD_DB_PASSWORD}
-      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER:-admin}
+      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
       - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN}
       - TRUSTED_PROXIES=172.18.0.0/16
@@ -107,8 +107,8 @@ services:
     volumes:
       - ./mealie/data:/app/data
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - BASE_URL=https://mealie.${DOMAIN}
       - DB_ENGINE=sqlite
@@ -214,8 +214,8 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
-      - USER_UID=${PUID:-1000}
-      - USER_GID=${PGID:-1000}
+      - USER_UID=${PUID}
+      - USER_GID=${PGID}
       - GITEA__database__DB_TYPE=postgres
       - GITEA__database__HOST=gitea-db:5432
       - GITEA__database__NAME=gitea
@@ -273,8 +273,8 @@ services:
     volumes:
       - ./dokuwiki/config:/config
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
@@ -311,8 +311,8 @@ services:
     volumes:
       - ./bookstack/config:/config
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - APP_URL=https://bookstack.${DOMAIN}
       - DB_HOST=bookstack-db
       - DB_PORT=3306
@@ -434,7 +434,7 @@ services:
       - JUPYTER_ENABLE_LAB=yes
       - GRANT_SUDO=yes
     user: root
-    command: start-notebook.sh --NotebookApp.token='${JUPYTER_TOKEN:-changeme}'
+    command: start-notebook.sh --NotebookApp.token='${JUPYTER_TOKEN}'
     # Uncomment for GPU support (NVIDIA, requires nvidia-container-toolkit)
     # runtime: nvidia
     # devices:
diff --git a/docker-compose/utilities/docker-compose.yml b/docker-compose/utilities/docker-compose.yml
index 184ab8a..dfe11fa 100644
--- a/docker-compose/utilities/docker-compose.yml
+++ b/docker-compose/utilities/docker-compose.yml
@@ -78,8 +78,8 @@ services:
       - /mnt:/source/mnt:ro
       - /mnt/backups:/backups
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
     labels:
       # TRAEFIK CONFIGURATION
@@ -155,14 +155,14 @@ services:
       - ./vaultwarden/data:/data
     environment:
       - DOMAIN=https://vault.${DOMAIN}
-      - SIGNUPS_ALLOWED=${BITWARDEN_SIGNUPS_ALLOWED:-true}
-      - INVITATIONS_ALLOWED=${BITWARDEN_INVITATIONS_ALLOWED:-true}
+      - SIGNUPS_ALLOWED=${BITWARDEN_SIGNUPS_ALLOWED}
+      - INVITATIONS_ALLOWED=${BITWARDEN_INVITATIONS_ALLOWED}
       - ADMIN_TOKEN=${BITWARDEN_ADMIN_TOKEN}
       # SMTP disabled - uncomment and configure to enable email
       # - SMTP_HOST=${SMTP_HOST}
       # - SMTP_FROM=${SMTP_FROM}
-      # - SMTP_PORT=${SMTP_PORT:-587}
-      # - SMTP_SECURITY=${SMTP_SECURITY:-starttls}
+      # - SMTP_PORT=${SMTP_PORT}
+      # - SMTP_SECURITY=${SMTP_SECURITY}
       # - SMTP_USERNAME=${SMTP_USERNAME}
       # - SMTP_PASSWORD=${SMTP_PASSWORD}
     labels:
diff --git a/docker-compose/vpn/docker-compose.yml b/docker-compose/vpn/docker-compose.yml
index 78a9d10..3bd80fb 100644
--- a/docker-compose/vpn/docker-compose.yml
+++ b/docker-compose/vpn/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       - VPN_TYPE=openvpn
       - OPENVPN_USER=${SURFSHARK_USERNAME}
       - OPENVPN_PASSWORD=${SURFSHARK_PASSWORD}
-      - SERVER_COUNTRIES=${VPN_SERVER_COUNTRIES:-Netherlands}
+      - SERVER_COUNTRIES=${VPN_SERVER_COUNTRIES}
       - TZ=${TZ}
     # TRAEFIK CONFIGURATION
     labels:
@@ -80,8 +80,8 @@ services:
       - ./qbittorrent/config:/config
       - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+      - PUID=${PUID}
+      - PGID=${PGID}
       - TZ=${TZ}
       - WEBUI_PORT=8080
     depends_on:
diff --git a/scripts/reset-ondemand-services.sh b/scripts/reset-ondemand-services.sh
old mode 100644
new mode 100755