diff --git a/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
index 075ee72a..5aad8593 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -458,8 +458,10 @@ install-scrcpy: distrobox-check-fedora
 
 # Install OpenTabletDriver, an open source, cross-platform, user-mode tablet driver
 install-opentabletdriver:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
     if grep -qvz "arch" <<< $(distrobox list); then \
-      distrobox-create --nvidia --image ghcr.io/ublue-os/arch-distrobox:latest -n arch -Y; \
+      Assemble noconfirmcreate "" "arch"; \
     fi && \
     distrobox enter -n arch -- ' paru -S opentabletdriver --noconfirm' && \
     mkdir -p ~/.config/systemd/user/ && \
@@ -506,7 +508,8 @@ restore-gnome-folders:
 [private]
 distrobox-check-fedora:
     #!/bin/env bash
+    source /usr/lib/ujust/ujust.sh
     if grep -qvz "fedora" <<< $(distrobox list); then
       echo "Setting up Fedora distrobox"
-      /usr/bin/ujust distrobox-fedora
+      Assemble noconfirmcreate "" "fedora"
     fi