diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index dbe9da43c8f..b81afe1d90f 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -140,7 +140,7 @@ jobs:
           docker rmi ${image}
 
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@v1.2.0
+        uses: jasonn3/build-container-installer@v1.2.1
         id: build
         with:
           arch: x86_64
diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index 922d65c9e0a..1f63f51aa3d 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -18,4 +18,5 @@ set -ouex pipefail
 . /tmp/build/aurora-changes.sh
 . /tmp/build/branding.sh
 . /tmp/build/initramfs.sh
+. /tmp/build/bootc.sh
 . /tmp/build/cleanup.sh
diff --git a/build_files/dx/build-dx.sh b/build_files/dx/build-dx.sh
index c6e43823a87..81c742be57a 100644
--- a/build_files/dx/build-dx.sh
+++ b/build_files/dx/build-dx.sh
@@ -13,5 +13,6 @@ sysctl -p
 . /tmp/build/fetch-install-dx.sh
 . /tmp/build/workarounds.sh
 . /tmp/build/systemd-dx.sh
+. /tmp/build/bootc.sh
 . /tmp/build/branding-dx.sh
 . /tmp/build/cleanup-dx.sh
diff --git a/build_files/shared/bootc.sh b/build_files/shared/bootc.sh
new file mode 100644
index 00000000000..31e1db532f9
--- /dev/null
+++ b/build_files/shared/bootc.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+if [ "$FEDORA_MAJOR_VERSION" -ge "40" ]; then
+    /usr/bin/bootupctl backend generate-update-metadata
+fi
diff --git a/build_files/shared/initramfs.sh b/build_files/shared/initramfs.sh
index 033e28394ae..e58acf1a62f 100755
--- a/build_files/shared/initramfs.sh
+++ b/build_files/shared/initramfs.sh
@@ -4,11 +4,11 @@ set -oue pipefail
 
 # Remove nvidia specific files
 if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then
-  rm /usr/lib/modprobe.d/nvk.conf
-  rm /usr/lib/modprobe.d/amd-legacy.conf
+  rm -f /usr/lib/modprobe.d/nvk.conf
+  rm -f /usr/lib/modprobe.d/amd-legacy.conf
 else
-  rm /usr/lib/dracut/dracut.conf.d/95-nvidia.conf
-  rm /usr/lib/modprobe.d/nvidia.conf
+  rm -f /usr/lib/dracut/dracut.conf.d/95-nvidia.conf
+  rm -f /usr/lib/modprobe.d/nvidia.conf
 fi
 
 if [[ "${AKMODS_FLAVOR}" == "surface" ]]; then
diff --git a/packages.json b/packages.json
index 40380495b29..786f8198b70 100644
--- a/packages.json
+++ b/packages.json
@@ -4,6 +4,7 @@
 			"all": [
 				"bash-color-prompt",
 				"bcache-tools",
+				"bootc",
 				"evtest",
 				"epson-inkjet-printer-escpr",
 				"epson-inkjet-printer-escpr2",