diff --git a/Makefile b/Makefile
index b1c6cbee5..f6229b2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ system-images/utils/utils.tar: $(UTILS_SRC)
 	cd system-images/utils && DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --tag start9/x_system/utils --platform=linux/arm64 -o type=docker,dest=utils.tar .
 
 ubuntu.img:
-	wget -O ubuntu.img.xz https://cdimage.ubuntu.com/releases/21.04/release/ubuntu-21.04-preinstalled-server-arm64+raspi.img.xz
+	wget -O ubuntu.img.xz https://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-arm64+raspi.img.xz
 	unxz ubuntu.img.xz
 
 product_key.txt:
diff --git a/build/initialization.sh b/build/initialization.sh
index 3899d3985..677f218ed 100755
--- a/build/initialization.sh
+++ b/build/initialization.sh
@@ -27,9 +27,13 @@ apt-get install -y \
 	cifs-utils \
 	samba-common-bin \
 	ntp \
-	network-manager
+	network-manager \
+	linux-modules-extra-raspi
 apt-get autoremove -y
 apt-get upgrade -y
+if [[ "$(uname -r)" = "5.13.0-1008-raspi" ]]; then
+	reboot
+fi
 
 sed -i 's/Restart=on-failure/Restart=always/g' /lib/systemd/system/tor@default.service
 sed -i '/}/i \ \ \ \ application\/wasm \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ wasm;' /etc/nginx/mime.types