diff --git a/docker-compose.yml b/docker-compose.yml
index 02d081a..2ba7d4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     hostname: authelia
     image: authelia/authelia
     environment:
-      - TZ=America/Chicago
+      - TZ=${TZ}
     ports:
       - 9091:9091
     restart: always
@@ -18,7 +18,7 @@ services:
     hostname: bitwarden
     image: vaultwarden/server:latest
     environment:
-      - TZ=$TZ
+      - TZ=${TZ}
       - ADMIN_TOKEN=h/oRssGu83I1E1WQGiSchYMAJnM0JcDXmjeI/A3QgMCasn/IK9zZldH5FXim0rSi
       - DATABASE_URL=data/db.sqlite3
       - DISABLE_ADMIN_TOKEN=false
@@ -58,10 +58,10 @@ services:
     hostname: freshrss
     image: freshrss/freshrss:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
+      - PUID=${PUID}
+      - PGID=${PGID}
       - CRON_MIN=*/20
-      - TZ=$TZ
+      - TZ=${TZ}
     depends_on:
       - freshrss-db
     ports:
@@ -77,8 +77,8 @@ services:
     hostname: freshrss-db
     image: postgres:12-alpine
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
+      - PUID=${PUID}
+      - PGID=${PGID}
       - POSTGRES_USER=freshrss
       - POSTGRES_PASSWORD=freshrss
       - POSTGRES_DB=freshrss
@@ -97,7 +97,7 @@ services:
       - WIREGUARD_ADDRESSES=10.64.154.79/32
       - HTTPPROXY=on
       - SERVER_CITIES=Chicago IL
-      - TZ=$TZ
+      - TZ=${TZ}
     cap_add:
       - NET_ADMIN
     devices:
@@ -126,9 +126,9 @@ services:
     hostname: jackett
     image: binhex/arch-jackett:latest
     environment:
-      - PGID=$PGID
-      - PUID=$PUID
-      - UMASK=$UMASK
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - UMASK=${UMASK}
     ports:
       - 9117:9117/tcp
     restart: always
@@ -142,10 +142,10 @@ services:
     container_name: jdownloader2
     image: jlesage/jdownloader-2:latest
     environment:
-      - PGID=$PGID
-      - PUID=$PUID
-      - UMASK=$UMASK
-      - TZ=$TZ
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - UMASK=${UMASK}
+      - TZ=${TZ}
       - KEEP_APP_RUNNING=1
       - CLEAN_TMP_DIR=1
       - MYJD_USER=akanealw@gmail.com
@@ -234,8 +234,8 @@ services:
     image: alexta69/metube
     environment:
       - STATE_DIR=/config
-      - PUID=$PUID
-      - PGID=$PGID
+      - PUID=${PUID}
+      - PGID=${PGID}
     ports:
       - 8082:8081
     restart: always
@@ -248,9 +248,9 @@ services:
     hostname: monitorr
     image: monitorr/monitorr:latest
     environment:
-      - PGID=$PGID
-      - PUID=$PUID
-      - TZ=$TZ
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - TZ=${TZ}
     ports:
       - 8084:80/tcp
     restart: always
@@ -264,9 +264,9 @@ services:
     image: lscr.io/linuxserver/mstream:latest
     container_name: mstream
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     ports:
       - 3001:3000
     restart: always
@@ -296,9 +296,9 @@ services:
     hostname: nzbhydra2
     image: binhex/arch-nzbhydra2:latest
     environment:
-      - PGID=$PGID
-      - PUID=$PUID
-      - UMASK=$UMASK
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - UMASK=${UMASK}
     ports:
       - 5076:5076/tcp
     restart: always
@@ -325,9 +325,9 @@ services:
     hostname: openssh-server
     image: lscr.io/linuxserver/openssh-server:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
       - PUBLIC_KEY_FILE=/config/aknlw.com.pub
       - USER_NAME=akanealw
     ports:
@@ -341,8 +341,8 @@ services:
     hostname: organizr
     image: organizr/organizr:latest
     environment:
-      - PGID=$PGID
-      - PUID=$PUID
+      - PGID=${PGID}
+      - PUID=${PUID}
       - FPM=false
     ports:
       - 8085:80/tcp
@@ -357,7 +357,7 @@ services:
     image: sctx/overseerr:latest
     environment:
       - LOG_LEVEL=info
-      - TZ=$TZ
+      - TZ=${TZ}
     ports:
       - 5055:5055
     restart: always
@@ -456,9 +456,9 @@ services:
     hostname: prowlarr
     image: ghcr.io/linuxserver/prowlarr:develop
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     ports:
       - 9696:9696
     restart: always
@@ -469,9 +469,9 @@ services:
     container_name: qbittorrent
     image: lscr.io/linuxserver/qbittorrent:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
       - WEBUI_PORT=8282
     network_mode: "service:gluetun"
     restart: unless-stopped
@@ -485,9 +485,9 @@ services:
     hostname: radarr
     image: lscr.io/linuxserver/radarr:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     ports:
       - 7878:7878
     restart: always
@@ -499,9 +499,9 @@ services:
     container_name: sabnzbd
     image: lscr.io/linuxserver/sabnzbd:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     network_mode: "service:gluetun"
     restart: unless-stopped
     volumes:
@@ -514,9 +514,9 @@ services:
     hostname: sonarr
     image: lscr.io/linuxserver/sonarr:latest
     environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     ports:
       - 8989:8989
     restart: always