diff --git a/general/overlay/etc/init.d/rcS b/general/overlay/etc/init.d/rcS
index 12d3a003..d9ae88ea 100755
--- a/general/overlay/etc/init.d/rcS
+++ b/general/overlay/etc/init.d/rcS
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Setting the TimeZone for all processes
+/usr/sbin/timezone.sh
 export TZ=$(cat /etc/TZ)
 
 # Set the firmware creation time as the base system time
diff --git a/general/overlay/usr/sbin/timezone.sh b/general/overlay/usr/sbin/timezone.sh
new file mode 100755
index 00000000..ec35c048
--- /dev/null
+++ b/general/overlay/usr/sbin/timezone.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+#Set the system timezone based on the u-boot environment variable
+
+#Convert the timezone from lowercase, replace underscores with spaces for proper searching
+convert_timezone() {
+    local converted=""
+    IFS="/"
+    for part in $1; do
+        part="$(echo "$part" | sed 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1' OFS=" " )"
+        if [ -z "$converted" ]; then
+            converted="$part"
+        else
+            converted="$converted/$part"
+        fi
+    done
+    unset IFS
+    echo "$converted"
+}
+
+#Seek the timezone from the u-boot environment variable
+timezone=$(fw_printenv -n timezone 2>/dev/null)
+if [ -z "$timezone" ]; then
+    echo "Timezone env variable not found, using system default."
+    exit 1
+fi
+
+#Set the system timezone file
+converted_timezone=$(convert_timezone "$timezone")
+echo "User defined timezone: $converted_timezone"
+echo $converted_timezone > /etc/timezone
+
+# Search for the transformed timezone in the file
+matching_line=$(zcat /var/www/a/tz.js.gz | grep -i -F "$converted_timezone")
+if [ -z "$matching_line" ]; then
+    echo "Timezone not found in system file."
+    exit 1
+fi
+
+# Extract the value associated with the timezone, set the system TZ file
+value=$(echo "$matching_line" | awk -F',' '{print $2}' | awk -F':' '{print $2}' | tr -d "'}")
+echo $value > /etc/TZ
+export TZ=$value
+
+if tty -s; then
+    echo "timezone.sh: You are running from a shell, please restart or log out to update timezone environment variables."
+fi