diff --git a/Makefile b/Makefile
index 6574f69e..8a475ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -46,13 +46,16 @@ packer: clean
 	sudo mv /tmp/packer /usr/bin/packer
 
 image: clean packer
+	export LC_ALL=en_GB.utf8
 	cd builder && sudo /usr/bin/packer init combined.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" combined.json.pkr.hcl
 
 bullseye: clean packer
+	export LC_ALL=en_GB.utf8
 	cd builder && sudo /usr/bin/packer init data/32bit/raspberrypi32.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/raspberrypi32.json.pkr.hcl
 	sudo pishrink -vaZ pwnagotchi-32bit.img
 
 bookworm: clean packer
+	export LC_ALL=en_GB.utf8
 	cd builder && sudo /usr/bin/packer init data/64bit/raspberrypi64.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/raspberrypi64.json.pkr.hcl
 	sudo pishrink -vaZ pwnagotchi-64bit.img
 
diff --git a/builder/data/32bit/raspberrypi32.yml b/builder/data/32bit/raspberrypi32.yml
index 31f3021b..3aa1f8f7 100644
--- a/builder/data/32bit/raspberrypi32.yml
+++ b/builder/data/32bit/raspberrypi32.yml
@@ -177,6 +177,7 @@
           - libusb-1.0-0-dev
           - lsof
           - make
+          - ntp
           - python3-flask
           - python3-flask-cors
           - python3-flaskext.wtf
@@ -237,6 +238,11 @@
         name: "{{ packages.apt.install }}"
         state: present
 
+    - name: set local RTC
+      shell: "timedatectl set-ntp true"
+      args:
+        executable: /bin/bash
+
     - name: update pip3, setuptools, wheel
       shell: "python3 -m pip install --upgrade pip setuptools wheel"
       args:
diff --git a/builder/data/64bit/raspberrypi64.yml b/builder/data/64bit/raspberrypi64.yml
index b208d60c..f2afdda6 100644
--- a/builder/data/64bit/raspberrypi64.yml
+++ b/builder/data/64bit/raspberrypi64.yml
@@ -137,6 +137,7 @@
           - libusb-1.0-0-dev
           - lsof
           - make
+          - ntp
           - python3-dbus
           - python3-flask
           - python3-flask-cors
@@ -180,6 +181,11 @@
         update_cache: yes
         install_recommends: false
 
+    - name: set local RTC
+      shell: "timedatectl set-ntp true"
+      args:
+        executable: /bin/bash
+
     - name: update pip3, setuptools, wheel
       shell: "python3 -m pip install --upgrade pip setuptools wheel --break-system-packages"
       args: