diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 3201006..997f3af 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -134,7 +134,7 @@ create_install() {
     
     info "Setting up keyrings..."
     $NSPAWN $TMPDIR/root pacman-key --init 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
+    $NSPAWN $TMPDIR/root pacman-key --populate archlinux archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
     
     info "Installing packages for $EDITION on $DEVICE..."
     # Install device and editions specific packages
@@ -233,6 +233,10 @@ create_install() {
         $NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1
         sed -i s/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)"/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck bootsplash-manjaro)"/g $TMPDIR/root/etc/mkinitcpio.conf
         $NSPAWN $TMPDIR/root mkinitcpio -P 1> /dev/null 2>&1
+    elif [[ "$DEVICE" = "pbpro" ]]; then
+        sed -i s/"WIFI_PWR_ON_BAT=on"/"WIFI_PWR_ON_BAT=off"/ $ROOTFS_IMG/rootfs_$ARCH/etc/default/tlp
+    elif [[ "$DEVICE" = "rockpi4" ]]; then
+        sed -i s/"WIFI_PWR_ON_BAT=on"/"WIFI_PWR_ON_BAT=off"/ $ROOTFS_IMG/rootfs_$ARCH/etc/default/tlp
     elif [[ "$DEVICE" = "pinephone" ]] || [[ "$DEVICE" = "pinetab" ]]; then
         $NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1
         sed -i s/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)"/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck bootsplash-manjaro)"/g $TMPDIR/root/etc/mkinitcpio.conf