diff --git a/.gitignore b/.gitignore
index f5bc5a2..83945b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 src/config.local
 src/custompios_path
-src/image/*.zip
-src/image-variants/*.zip
+src/image
+src/image-*
+!src/image/README
 **/key.json
 src/nightly_build_scripts/index.html
 src/nightly_build_scripts/node_modules
diff --git a/src/config b/src/config
index 7cec3af..3d1fee9 100644
--- a/src/config
+++ b/src/config
@@ -2,4 +2,4 @@ export DIST_NAME=FluiddPI
 export DIST_VERSION=0.4.0
 export BASE_IMAGE_ENLARGEROOT=2500
 export BASE_IMAGE_RESIZEROOT=500
-export MODULES="base,releaseinfochange(network,raspicam,klipper,moonraker,fluidd,mjpgstreamer,password-for-sudo)"
+export MODULES="base,pkgupgrade(network,raspicam,klipper,moonraker,fluidd,mjpgstreamer,password-for-sudo)"
diff --git a/src/modules/moonraker/end_chroot_script b/src/modules/moonraker/end_chroot_script
new file mode 100644
index 0000000..1658bf8
--- /dev/null
+++ b/src/modules/moonraker/end_chroot_script
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+rm -rf /etc/sudoers.d/pi-moonraker-install
diff --git a/src/modules/moonraker/start_chroot_script b/src/modules/moonraker/start_chroot_script
index f90e4b7..62a188f 100644
--- a/src/modules/moonraker/start_chroot_script
+++ b/src/modules/moonraker/start_chroot_script
@@ -17,6 +17,11 @@ install_cleanup_trap
 unpack /filesystem/home/pi /home/pi pi
 unpack /filesystem/root /
 
+if [ -f /etc/armbian-release ]; then
+  echo "pi ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/pi-moonraker-install
+  chmod 0440 /etc/sudoers.d/pi-moonraker-install
+fi
+
 echo "Installing Moonraker"
 
 apt update
diff --git a/src/modules/releaseinfochange/start_chroot_script b/src/modules/releaseinfochange/start_chroot_script
deleted file mode 100644
index ee6431e..0000000
--- a/src/modules/releaseinfochange/start_chroot_script
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-source /common.sh
-install_cleanup_trap
-
-apt update --allow-releaseinfo-change
-apt full-upgrade --yes
\ No newline at end of file