diff --git a/builder/data/32bit/etc/rc.local b/builder/data/32bit/etc/rc.local
new file mode 100644
index 00000000..da315cff
--- /dev/null
+++ b/builder/data/32bit/etc/rc.local
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+timedatectl set-ntp true
+
+exit 0
\ No newline at end of file
diff --git a/builder/data/32bit/raspberrypi32.yml b/builder/data/32bit/raspberrypi32.yml
index 453de361..acb2cda3 100644
--- a/builder/data/32bit/raspberrypi32.yml
+++ b/builder/data/32bit/raspberrypi32.yml
@@ -229,6 +229,11 @@
         path: '{{ pwnagotchi.custom_plugin_dir }}'
         state: directory
 
+    - name: remove current rc.local
+      file:
+        path: /etc/rc.local
+        state: absent
+
     - name: update apt package cache
       apt:
         update_cache: yes
diff --git a/builder/data/32bit/usr/bin/pwnagotchi-launcher b/builder/data/32bit/usr/bin/pwnagotchi-launcher
index 9728c0cd..d9d8b885 100755
--- a/builder/data/32bit/usr/bin/pwnagotchi-launcher
+++ b/builder/data/32bit/usr/bin/pwnagotchi-launcher
@@ -11,6 +11,7 @@ fi
 
 if is_auto_mode; then
   /usr/local/bin/pwnagotchi
+  systemctl restart bettercap
 else
   /usr/local/bin/pwnagotchi --manual
 fi
diff --git a/builder/data/64bit/etc/rc.local b/builder/data/64bit/etc/rc.local
new file mode 100644
index 00000000..da315cff
--- /dev/null
+++ b/builder/data/64bit/etc/rc.local
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+timedatectl set-ntp true
+
+exit 0
\ No newline at end of file
diff --git a/builder/data/64bit/raspberrypi64.yml b/builder/data/64bit/raspberrypi64.yml
index b26b1f7b..ee73037b 100644
--- a/builder/data/64bit/raspberrypi64.yml
+++ b/builder/data/64bit/raspberrypi64.yml
@@ -199,12 +199,10 @@
         path: /boot/firmware/ssh
         state: touch
 
-    - name: adjust /boot/firmware/config.txt
-      lineinfile:
-        dest: /boot/firmware/config.txt
-        insertafter: EOF
-        line: '{{ item }}'
-      with_items: "{{ system.boot_options }}"
+    - name: remove current rc.local
+      file:
+        path: /etc/rc.local
+        state: absent
 
     - name: change root partition
       replace:
diff --git a/builder/data/64bit/usr/bin/pwnagotchi-launcher b/builder/data/64bit/usr/bin/pwnagotchi-launcher
index 9728c0cd..d9d8b885 100755
--- a/builder/data/64bit/usr/bin/pwnagotchi-launcher
+++ b/builder/data/64bit/usr/bin/pwnagotchi-launcher
@@ -11,6 +11,7 @@ fi
 
 if is_auto_mode; then
   /usr/local/bin/pwnagotchi
+  systemctl restart bettercap
 else
   /usr/local/bin/pwnagotchi --manual
 fi