diff --git a/install.sh b/install.sh
index 101d9ea0..1ffd8170 100755
--- a/install.sh
+++ b/install.sh
@@ -48,6 +48,16 @@ if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then
     sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=110/}' /etc/yum.repos.d/rpmfusion-*-updates-testing.repo
 fi
 
+# Temporary fix for an upstream issue
+# https://github.com/coreos/rpm-ostree/issues/5048
+if [[ "${FEDORA_MAJOR_VERSION}" -eq 40 ]]; then
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+        rpm-ostree \
+        rpm-ostree-libs
+fi
+
 # after F41 launches, bump to 42
 if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then
     # note: this is done before single mirror hack to ensure this persists in image and is not reset
diff --git a/packages.json b/packages.json
index 531f9004..6f0b108a 100644
--- a/packages.json
+++ b/packages.json
@@ -44,18 +44,18 @@
                 "pam_yubico",
                 "pamu2fcfg",
                 "pipewire-codec-aptx",
-		"pipewire-plugin-libcamera",
+                "pipewire-plugin-libcamera",
                 "powerstat",
                 "smartmontools",
                 "solaar-udev",
-		"squashfs-tools",
+                "squashfs-tools",
                 "symlinks",
                 "tcpdump",
                 "tmux",
                 "traceroute",
                 "vim",
                 "wireguard-tools",
-		"yubikey-manager",
+                "yubikey-manager",
                 "zstd"
             ],
             "silverblue": [