diff --git a/02_build_image.sh b/02_build_image.sh
index e45da98..256fc83 100755
--- a/02_build_image.sh
+++ b/02_build_image.sh
@@ -18,6 +18,8 @@ touch "${IMAGE_PATH}"/ubuntu
 cp -r "${ROOT_PATH}"/files/preseed "${IMAGE_PATH}"/preseed
 cp "${ROOT_PATH}/files/grub/grub.cfg" "${IMAGE_PATH}"/isolinux/grub.cfg
 
+echo >&2 "===]> Info: Reset firmware flag for fresh boot... "
+rm -f "${CHROOT_PATH}/etc/get_apple_firmware_attempted" || true
 
 echo >&2 "===]> Info: Compress the chroot... "
 cd "${WORKING_PATH}"
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 4fe527d..6dc6814 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -123,6 +123,12 @@ printf 'apple-bce' >>/etc/modules-load.d/t2.conf
 #printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=1\n'  >> /etc/modprobe.d/apple-tb.conf
 #printf '\n# delay loading of the touchbar driver\ninstall apple-ib-tb /bin/sleep 7; /sbin/modprobe --ignore-install apple-ib-tb' >> /etc/modprobe.d/delay-tb.conf
 
+echo >&2 "===]> Info: Setup auto-fetch firmware service... "
+
+curl -s https://raw.githubusercontent.com/t2linux/wiki/refs/heads/master/docs/tools/get-apple-firmware.service -o /etc/systemd/system/get-apple-firmware.service
+
+systemctl enable get-apple-firmware.service
+
 echo >&2 "===]> Info: Update initramfs... "
 
 ## Add custom drivers to be loaded at boot