diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c3668b972..29e695b521 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -201,7 +201,7 @@ jobs:
             sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }}
 
             # Add rechunk as well to remove this source of failure
-            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.2
+            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.1
 
       - name: Get source versions
         id: labels
@@ -321,9 +321,9 @@ jobs:
       # Reprocess raw-img using rechunker which will delete it
       - name: Run Rechunker
         id: rechunk
-        uses: hhd-dev/rechunk@v1.1.2
+        uses: hhd-dev/rechunk@v1.1.1
         with:
-          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.2'
+          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.1'
           ref: 'raw-img'
           prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}'
           version: '${{ steps.generate-version.outputs.tag }}'
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
index 5cb65cb9ba..9f8e623dcb 100644
--- a/.github/workflows/clean.yml
+++ b/.github/workflows/clean.yml
@@ -14,7 +14,7 @@ jobs:
       packages: write
     steps:
       - name: Delete Images Older Than 90 Days
-        uses: dataaxiom/ghcr-cleanup-action@v1.0.16
+        uses: dataaxiom/ghcr-cleanup-action@v1.0.15
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           packages: bazzite,bazzite-ally-budgie,bazzite-asus-nvidia,bazzite-asus-nvidia-open,bazzite-budgie,bazzite-budgie-asus,bazzite-budgie-asus-nvidia,bazzite-budgie-nvidia,bazzite-budgie-surface,bazzite-budgie-surface-nvidia,bazzite-deck,bazzite-deck-budgie,bazzite-deck-gnome,bazzite-deck-gnome-nokmods,bazzite-deck-gnome-nvidia,bazzite-deck-nokmods,bazzite-deck-nvidia,bazzite-framegame-budgie,bazzite-gnome,bazzite-gnome-asus-nvidia,bazzite-gnome-asus-nvidia-open,bazzite-gnome-nokmods,bazzite-gnome-nvidia,bazzite-gnome-nvidia-open,bazzite-nokmods,bazzite-nvidia,bazzite-nvidia-open
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
index 85010ee846..0ad51bc5a3 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
@@ -131,14 +131,16 @@ install-scrcpy: distrobox-check-fedora
 install-opentabletdriver:
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
-    echo "Installing OpenTabletDriver..."
-    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
-    flatpak --system install -y flathub net.opentabletdriver.OpenTabletDriver && \
-    mkdir -p $HOME/.config/OpenTabletDriver && \
-    flatpak override --user --filesystem=xdg-config/OpenTabletDriver net.opentabletdriver.OpenTabletDriver && \
-    curl -s https://raw.githubusercontent.com/flathub/net.opentabletdriver.OpenTabletDriver/refs/heads/master/scripts/opentabletdriver.service > ~/.config/systemd/user/opentabletdriver.service  && \
+    if grep -qvz "arch" <<< $(distrobox list); then \
+      Assemble noconfirmcreate "" "arch"; \
+    fi && \
+    distrobox enter -n arch -- bash -c 'paru -Syu --noconfirm && paru -S opentabletdriver --noconfirm' && \
+    mkdir -p ~/.config/systemd/user/ && \
+    rm -f ~/.config/systemd/user/arch-opentabletdriver.service && \
+    wget https://raw.githubusercontent.com/ublue-os/bazzite/main/post_install_files/OpenTabletDriver/opentabletdriver.service -O ~/.config/systemd/user/arch-opentabletdriver.service && \
     systemctl --user daemon-reload && \
-    systemctl enable --user --now opentabletdriver.service
+    systemctl enable --user --now arch-opentabletdriver.service && \
+    distrobox enter -n arch -- bash -c 'distrobox-export --app otd-gui'
 
 # Install Docker, a platform designed to help developers build, share, and run container applications
 install-docker: