diff --git a/files/scripts/mesa-fix.sh b/files/scripts/mesa-fix.sh
new file mode 100644
index 0000000..8926803
--- /dev/null
+++ b/files/scripts/mesa-fix.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# Tell this script to exit if there are any errors.
+# You should have this in every custom script, to ensure that your completed
+# builds actually ran successfully without any errors!
+set -oue pipefail
+
+mkdir -p /tmp/mesa-fix64/dri && \
+    cp /usr/lib64/libgallium-*.so /tmp/mesa-fix64/ && \
+    cp /usr/lib64/dri/kms_swrast_dri.so /tmp/mesa-fix64/dri/ && \
+    cp /usr/lib64/dri/libdril_dri.so /tmp/mesa-fix64/dri/ && \
+    cp /usr/lib64/dri/swrast_dri.so /tmp/mesa-fix64/dri/ && \
+    cp /usr/lib64/dri/virtio_gpu_dri.so /tmp/mesa-fix64/dri/ && \
+    mkdir -p /tmp/mesa-fix32/dri && \
+    cp /usr/lib/libgallium-*.so /tmp/mesa-fix32/ && \
+    cp /usr/lib/dri/kms_swrast_dri.so /tmp/mesa-fix32/dri/ && \
+    cp /usr/lib/dri/libdril_dri.so /tmp/mesa-fix32/dri/ && \
+    cp /usr/lib/dri/swrast_dri.so /tmp/mesa-fix32/dri/ && \
+    cp /usr/lib/dri/virtio_gpu_dri.so /tmp/mesa-fix32/dri/ && \
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
+        mesa-libxatracker \
+        mesa-libglapi \
+        mesa-dri-drivers \
+        mesa-libgbm \
+        mesa-libEGL \
+        mesa-vulkan-drivers \
+        mesa-libGL \
+        pipewire \
+        pipewire-alsa \
+        pipewire-gstreamer \
+        pipewire-jack-audio-connection-kit \
+        pipewire-jack-audio-connection-kit-libs \
+        pipewire-libs \
+        pipewire-pulseaudio \
+        pipewire-utils \
+        pipewire-plugin-libcamera \
+        bluez \
+        bluez-obexd \
+        bluez-cups \
+        bluez-libs \
+        xorg-x11-server-Xwayland && \
+    rsync -a /tmp/mesa-fix64/ /usr/lib64/ && \
+    rsync -a /tmp/mesa-fix32/ /usr/lib/ && \
+    rm -rf /tmp/mesa-fix64 && \
+    rm -rf /tmp/mesa-fix32
diff --git a/files/scripts/mesa-fix_1.sh b/files/scripts/mesa-fix_1.sh
deleted file mode 100644
index e51c23e..0000000
--- a/files/scripts/mesa-fix_1.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell this script to exit if there are any errors.
-# You should have this in every custom script, to ensure that your completed
-# builds actually ran successfully without any errors!
-set -oue pipefail
-
-mkdir -p /tmp/mesa-fix64/dri
-cp /usr/lib64/libgallium-*.so /tmp/mesa-fix64/
-cp /usr/lib64/dri/kms_swrast_dri.so /tmp/mesa-fix64/dri/
-cp /usr/lib64/dri/libdril_dri.so /tmp/mesa-fix64/dri/
-cp /usr/lib64/dri/swrast_dri.so /tmp/mesa-fix64/dri/
-cp /usr/lib64/dri/virtio_gpu_dri.so /tmp/mesa-fix64/dri/
-mkdir -p /tmp/mesa-fix32/dri
-cp /usr/lib/libgallium-*.so /tmp/mesa-fix32/
-cp /usr/lib/dri/kms_swrast_dri.so /tmp/mesa-fix32/dri/
-cp /usr/lib/dri/libdril_dri.so /tmp/mesa-fix32/dri/
-cp /usr/lib/dri/swrast_dri.so /tmp/mesa-fix32/dri/
-cp /usr/lib/dri/virtio_gpu_dri.so /tmp/mesa-fix32/dri/
diff --git a/files/scripts/mesa-fix_2.sh b/files/scripts/mesa-fix_2.sh
deleted file mode 100644
index 0eae92a..0000000
--- a/files/scripts/mesa-fix_2.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell this script to exit if there are any errors.
-# You should have this in every custom script, to ensure that your completed
-# builds actually ran successfully without any errors!
-set -oue pipefail
-
-rsync -a /tmp/mesa-fix64/ /usr/lib64/
-rsync -a /tmp/mesa-fix32/ /usr/lib/
-rm -rf /tmp/mesa-fix64
-rm -rf /tmp/mesa-fix32
diff --git a/recipes/gnome/zeliblue-deck.yml b/recipes/gnome/zeliblue-deck.yml
index 960e59a..5bfdf4b 100644
--- a/recipes/gnome/zeliblue-deck.yml
+++ b/recipes/gnome/zeliblue-deck.yml
@@ -37,37 +37,7 @@ modules:
 
   - type: script
     scripts:
-      - mesa-fix_1.sh
-
-  - type: rpm-ostree
-    replace:
-      - from-repo: https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-%OS_VERSION%/kylegospo-bazzite-multilib-fedora-%OS_VERSION%.repo?arch=x86_64
-        packages:
-          - mesa-libxatracker
-          - mesa-libglapi
-          - mesa-dri-drivers
-          - mesa-libgbm
-          - mesa-libEGL
-          - mesa-vulkan-drivers
-          - mesa-libGL
-          - pipewire
-          - pipewire-alsa
-          - pipewire-gstreamer
-          - pipewire-jack-audio-connection-kit
-          - pipewire-jack-audio-connection-kit-libs
-          - pipewire-libs
-          - pipewire-pulseaudio
-          - pipewire-utils
-          - pipewire-plugin-libcamera
-          - bluez
-          - bluez-obexd
-          - bluez-cups
-          - bluez-libs
-          - xorg-x11-server-Xwayland
-
-  - type: script
-    scripts:
-      - mesa-fix_2.sh
+      - mesa-fix.sh
 
   - type: rpm-ostree
     repos: