diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0d6ccf0..c1ba63e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -318,7 +318,7 @@ jobs:
           rsync -rlvz --delete \
             --no-perms --no-owner --no-group --no-times \
             --exclude='.git' --exclude='.github' --exclude='.vscode' \
-            --exclude='wg0.conf' \
+            --exclude='wg0.conf' --exclude='deploy-logs' \
             ./ ${{ vars.HOST_USER }}@${{ vars.HOST_IP }}:/config/stacks/
 
       # STEP - Discconect from Wireguard
diff --git a/ai/.env b/ai/.env
index cec9ff9..7f68271 100644
--- a/ai/.env
+++ b/ai/.env
@@ -3,7 +3,9 @@ COMPOSE_PROJECT_NAME=ai
 TZ=Pacific/Auckland
 DOCKERDIR=/docker/${COMPOSE_PROJECT_NAME}
 DOMAIN=#{DOMAIN}#
-KUMA_CFHEADERS=#{KUMA_CFHEADERS}#
+
+#AUTOKUMA Variables
+KUMA_CFHEADERS=#{CLOUDFLARE_SERVICETOKEN}#
 
 # Hermes Variables
 HERMES_OAUTH_CLIENTID=#{HERMES-OAUTH-CLIENTID}#
diff --git a/games/docker-compose.yml b/games/docker-compose.yml
index d54ec18..3478647 100644
--- a/games/docker-compose.yml
+++ b/games/docker-compose.yml
@@ -69,7 +69,7 @@ services:
     volumes:
       - ${DOCKERDIR}/amp:/home/amp/.ampdata
     environment:
-      - TZ=Pacific/Auckland # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+      - TZ=${TZ}
       - AMP_LICENSE=${AMP_LICENSE}
       - MODULE=ADS
     labels:
@@ -95,6 +95,7 @@ services:
       games:
         ipv4_address: 10.1.20.253
     environment:
+      - TZ=${TZ}
       - SECRET_KEY=${PLAYIT_SECRET}
 
 #Shared Networks between containers    
diff --git a/homeautomation/docker-compose.yml b/homeautomation/docker-compose.yml
index c92b58a..512d7c1 100644
--- a/homeautomation/docker-compose.yml
+++ b/homeautomation/docker-compose.yml
@@ -24,6 +24,8 @@ services:
       - ${DOCKERDIR}/homeassistant/.ssh:/root/.ssh
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /var/run/dbus:/var/run/dbus:ro
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -57,6 +59,8 @@ services:
       - /dev/serial/by-id/usb-Prolific_Technology_Inc._USB-Serial_Controller_D-if00-port0:/dev/ttyUSB0
     group_add:
       - dialout
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -85,7 +89,8 @@ services:
       - ${DOCKERDIR}/mosquitto/config:/mosquitto/config
       - ${DOCKERDIR}/mosquitto/data:/mosquitto/data
       - ${DOCKERDIR}/mosquitto/log:/mosquitto/log
-  
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - "traefik.enable=false"
@@ -99,6 +104,8 @@ services:
     networks:
        IoT:
         ipv4_address: 10.1.11.17
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -136,6 +143,8 @@ services:
         target: /tmp/cache
         tmpfs:
           size: 1000000000
+    environment:
+      - TZ=${TZ}
     labels:
      # Traefik - Service
     - traefik.enable=true
diff --git a/management/docker-compose.yml b/management/docker-compose.yml
index 9f114c0..489b72a 100644
--- a/management/docker-compose.yml
+++ b/management/docker-compose.yml
@@ -12,6 +12,8 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock 
       - ${DOCKERDIR}/portainer:/data 
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -37,6 +39,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ${DOCKERDIR}/dockhand:/app/data
       - /config/stacks:/stacks
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -60,6 +64,8 @@ services:
       management:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - TZ=${TZ}
     command: --cleanup --interval 3600
     labels: 
     # Traefik - General
@@ -74,6 +80,8 @@ services:
        management:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 43a6368..59517d8 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -18,6 +18,7 @@ services:
     devices:
     - /dev/dri:/dev/dri
     environment:
+    - TZ=${TZ}
     - HOSTNAME=O's
     - ALLOWED_NETWORKS=10.1.1.0/24,10.1.10.0/24,10.1.11.0/24
     labels:
@@ -38,6 +39,8 @@ services:
        media:
     volumes:
       - ${DOCKERDIR}/seerr:/app/config
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -64,6 +67,8 @@ services:
       - ${DOCKERDIR}/sonarr:/config
       - /mnt/storage/downloads:/downloads
       - ${NAS_MEDIADIR}/TV:/tv
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -90,6 +95,8 @@ services:
       - /mnt/storage/downloads:/downloads
       - ${NAS_MEDIADIR}/CHILDREN MOVIES:/kidsmovies
       - ${NAS_MEDIADIR}/MOVIES:/movies
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -113,6 +120,8 @@ services:
        media:
     volumes:
       - ${DOCKERDIR}/maintainerr:/opt/data
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -137,6 +146,8 @@ services:
     volumes:
       - ${DOCKERDIR}/sabnzbd:/config
       - /mnt/storage/downloads:/downloads
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -161,6 +172,8 @@ services:
        media:
     volumes:
       - ${DOCKERDIR}/Wrapperr:/app/config
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -185,6 +198,8 @@ services:
        media:
     volumes:
       - ${DOCKERDIR}/tautulli:/config
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -208,7 +223,7 @@ services:
     networks:
        media:
     environment:
-      - TZ=Pacific/Auckland
+      - TZ=${TZ}
       - UMASK_SET=002
       - webUIPort=8265
       - internalNode=true
@@ -252,6 +267,7 @@ services:
     security_opt:
       - apparmor:unconfined
     environment:
+      - TZ=${TZ}
       - LOG_LEVEL=info
     labels:
     # Traefik - Service
diff --git a/misc/docker-compose.yml b/misc/docker-compose.yml
index 8bab0a3..b5ff7c9 100644
--- a/misc/docker-compose.yml
+++ b/misc/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     restart: always
     networks:
        misc:
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -39,6 +41,8 @@ services:
     #environment:
     #  - DOCKER_ENABLE_SECURITY=false
       #- LANGS=en_GB
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -63,6 +67,8 @@ services:
        misc:
     volumes:
       - ${DOCKERDIR}/ConvertX/:/app/data
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -89,6 +95,7 @@ services:
     volumes:
       - ${DOCKERDIR}/Open-Design:/app/.od
     environment:
+      - TZ=${TZ}
       - NODE_ENV=production
       - OD_BIND_HOST=0.0.0.0
       - OD_PORT=7456
diff --git a/monitor/docker-compose.yml b/monitor/docker-compose.yml
index 8f1be02..948c6de 100644
--- a/monitor/docker-compose.yml
+++ b/monitor/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       - /mnt/storage:/mnt/storage:ro
       - /sys:/sys:ro
     environment:
+    - TZ=${TZ}
     - GLANCES_OPT=-w
     labels:
     # Traefik - Service
@@ -60,6 +61,8 @@ services:
       - /sys:/host/sys:ro
       - /etc/os-release:/host/etc/os-release:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -83,6 +86,7 @@ services:
     networks:
       monitor:
     environment:
+      TZ: ${TZ}
       AUTOKUMA__KUMA__URL: ${KUMA_URL}
       AUTOKUMA__KUMA__USERNAME: ${KUMA_USERNAME}
       AUTOKUMA__KUMA__PASSWORD: ${KUMA_PASSWORD}
diff --git a/network/docker-compose.yml b/network/docker-compose.yml
index a3facef..d1a1894 100644
--- a/network/docker-compose.yml
+++ b/network/docker-compose.yml
@@ -11,6 +11,8 @@ services:
     volumes:
       - ${DOCKERDIR}/adguard/config:/opt/adguardhome/conf
       - ${DOCKERDIR}/adguard/work:/opt/adguardhome/work
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -38,6 +40,7 @@ services:
       IoT:
         ipv4_address: 10.1.11.243
     environment:
+      - TZ=${TZ}
       - CONFIGFILE=/config/adguardhome-sync.yaml #optional
     volumes:
       - ${DOCKERDIR}/adguardhome-sync:/config
@@ -63,6 +66,8 @@ services:
     networks:
       IoT:
         ipv4_address: 10.1.11.242
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
diff --git a/proxy/docker-compose.yml b/proxy/docker-compose.yml
index 974ba22..2d20989 100644
--- a/proxy/docker-compose.yml
+++ b/proxy/docker-compose.yml
@@ -66,6 +66,7 @@ services:
       - ${DOCKERDIR}/traefik/logs:/var/log/traefik
       #- ${DOCKERDIR}/certs:/certs
     environment:
+    - TZ=${TZ}
     - CF_API_EMAIL=${CF_API_EMAIL}
     - CF_API_KEY=${CF_API_KEY}
     labels:
@@ -97,6 +98,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
+      - TZ=${TZ}
       - TRAEFIK_VERSION=2
       - REFRESH_ENTRIES=TRUE
       - CF_EMAIL=${CF_API_EMAIL}
@@ -117,6 +119,8 @@ services:
         ipv4_address: 10.1.254.1
     volumes:
       - ${DOCKERDIR}/cloudflare-tunnel:/home/nonroot/.cloudflared
+    environment:
+      - TZ=${TZ}
     command: tunnel --config /home/nonroot/.cloudflared/config.yml run ${CF_TUNNEL}
 
 
@@ -127,6 +131,8 @@ services:
     restart: always 
     networks:
        proxy:
+    environment:
+      - TZ=${TZ}
     labels: 
     # Traefik - Service
     - traefik.enable=true
diff --git a/security/docker-compose.yml b/security/docker-compose.yml
index 87b8c9c..f6c9eb9 100644
--- a/security/docker-compose.yml
+++ b/security/docker-compose.yml
@@ -10,6 +10,7 @@ services:
     networks:
        security:
     environment:
+      TZ: ${TZ}
       #WEBSOCKET_ENABLED: 'true' # Required to use websockets
       SIGNUPS_ALLOWED: 'false'   # set to false to disable signups
       ADMIN_TOKEN: ${BITWARDEN_ADMIN_TOKEN}
diff --git a/storage/docker-compose.yml b/storage/docker-compose.yml
index 3a29373..d4a65b5 100644
--- a/storage/docker-compose.yml
+++ b/storage/docker-compose.yml
@@ -18,6 +18,8 @@ services:
       - /dev/sdc:/dev/sdc
       - /dev/sdd:/dev/sdd
       - /dev/sde:/dev/sde
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=false
@@ -43,6 +45,8 @@ services:
       - /dev/sdc:/dev/sdc
       - /dev/sdd:/dev/sdd
       - /dev/sde:/dev/sde
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true
@@ -68,6 +72,7 @@ services:
       - ${DOCKERDIR}/crashplan/config:/config
       - /mnt/storage:/storage:ro
     environment:
+      - TZ=${TZ}
       - CRASHPLAN_SRV_MAX_MEM=4G
     labels:
     # Traefik - Service
@@ -101,6 +106,8 @@ services:
       - /run
     cap_add:
       - SYS_RAWIO # smartctl support
+    environment:
+      - TZ=${TZ}
     labels:
     # Traefik - Service
     - traefik.enable=true