diff --git a/Containerfile b/Containerfile
index bd8e99327d..e2f4013250 100644
--- a/Containerfile
+++ b/Containerfile
@@ -169,7 +169,6 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         gnome-shell-extension-gsconnect \
         nautilus-gsconnect \
         gnome-shell-extension-system76-scheduler \
-        gnome-shell-extension-caribou-blocker \
         gnome-shell-extension-compiz-windows-effect \
         gnome-shell-extension-just-perfection \
         gnome-shell-extension-blur-my-shell \
@@ -257,7 +256,8 @@ RUN if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
         libFAudio \
         wine-core.x86_64 \
         wine-core.i686 \
-        wine-pulseaudio \
+        wine-pulseaudio.x86_64 \
+        wine-pulseaudio.i686 \
         winetricks \
         protontricks \
         latencyflex-vulkan-layer \
@@ -404,6 +404,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
     rpm-ostree install \
         steamdeck-gnome-presets \
         gnome-shell-extension-bazzite-menu \
+        gnome-shell-extension-caribou-blocker \
         sddm && \
     wget https://raw.githubusercontent.com/doitsujin/dxvk/master/dxvk.conf -O /usr/etc/dxvk-example.conf \
 ; fi
@@ -436,6 +437,7 @@ RUN rpm-ostree install \
     zstd \
     zenity \
     newt \
+    qt5-qtvirtualkeyboard \
     python-vdf \
     python-crcmod && \
     git clone https://gitlab.com/evlaV/jupiter-dock-updater-bin.git \
@@ -514,7 +516,8 @@ RUN rpm-ostree install \
         gamescope-session-steam \
         wine-core.x86_64 \
         wine-core.i686 \
-        wine-pulseaudio \
+        wine-pulseaudio.x86_64 \
+        wine-pulseaudio.i686 \
         winetricks \
         protontricks \
         gperftools-libs.i686 && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just b/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just
index 436d506750..58241b8b53 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just
@@ -47,33 +47,25 @@ distrobox-bazzite-arch:
   distrobox-create --unshare-netns --nvidia --image ghcr.io/ublue-os/bazzite-arch -n bazzite-arch -Y
 
 # Install Webapp manager
-install-webapp-manager:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-webapp-manager: distrobox-check-fedora
   distrobox-enter -n fedora -- bash -c "sudo dnf copr enable -y kylegospo/webapp-manager && \
     sudo dnf install -y webapp-manager && \
     distrobox-export --app webapp-manager"
 
 # Install Oversteer for Logitech steering wheels
-install-oversteer:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-oversteer: distrobox-check-fedora
   distrobox enter -n fedora -- bash -c 'sudo dnf copr enable -y kylegospo/oversteer && \
     sudo dnf install -y oversteer && \
     distrobox-export --app oversteer'
 
 # Install OpenRazer for Razer gaming hardware
-install-openrazer:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-openrazer: distrobox-check-fedora
   distrobox-enter -n fedora -- bash -c 'sudo wget https://download.opensuse.org/repositories/hardware:/razer/Fedora_$(rpm -E %fedora)/hardware:razer.repo -O /etc/yum.repos.d/hardware:razer.repo && \
     sudo dnf install -y \
       openrazer-meta \
       razergenie && \
     distrobox-export --app razergenie' && \
+  mkdir -p ~/.config/systemd/user && \
   wget https://raw.githubusercontent.com/ublue-os/bazzite/main/post_install_files/OpenRazer/openrazer-daemon.service -O ~/.config/systemd/user/openrazer-daemon.service && \
   systemctl --user daemon-reload && \
   systemctl enable --user openrazer-daemon.service && \
@@ -84,10 +76,7 @@ install-openrazer:
   echo "Please reboot to apply needed changes."
 
 # Install Solaar for Logitech Mice, Keyboards, and Trackpads
-install-solaar:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-solaar: distrobox-check-fedora
   distrobox-enter -n fedora -- bash -c 'sudo dnf install -y \
     solaar && \
     distrobox-export --app solaar' && \
@@ -97,10 +86,7 @@ install-solaar:
   sed -i 's/fedora --   solaar/fedora --   solaar --window=hide/g' ~/.config/autostart/fedora-solaar.desktop
 
 # Install Resilio Sync, a file synchronization utility powered by BitTorrent
-install-resilio-sync:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-resilio-sync: distrobox-check-fedora
   distrobox-enter -n fedora -- 'sudo rpm --import https://linux-packages.resilio.com/resilio-sync/key.asc' && \
   distrobox-enter -n fedora -- 'sudo wget https://raw.githubusercontent.com/ublue-os/bazzite/main/post_install_files/resilio_sync/resilio-sync.repo -O /etc/yum.repos.d/resilio-sync.repo' && \
   distrobox-enter -n fedora -- 'sudo dnf install -y resilio-sync' && \
@@ -111,10 +97,7 @@ install-resilio-sync:
   systemctl enable --user --now fedora-resilio-sync.service
 
 # Install scrcpy, a utility that mirrors Android devices (video and audio) connected via USB or over TCP/IP
-install-scrcpy:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    distrobox-create --nvidia --image ghcr.io/ublue-os/fedora-distrobox:latest -n fedora -Y; \
-  fi && \
+install-scrcpy: distrobox-check-fedora
   distrobox enter -n fedora -- bash -c 'sudo dnf copr enable -y zeno/scrcpy && \
     sudo dnf install -y scrcpy && \
     distrobox-export --app scrcpy'
@@ -130,3 +113,12 @@ install-opentabletdriver:
   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 arch-opentabletdriver.service
+
+# Create fedora distrobox if it doesn't exist
+[private]
+distrobox-check-fedora:
+  #!/bin/env bash
+  if grep -qvz "fedora" <<< $(distrobox list); then
+    echo "Setting up Fedora distrobox"
+    /usr/bin/ujust distrobox-fedora
+  fi
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just b/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just
index a97de6bccd..21bfeff550 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just
@@ -102,6 +102,7 @@ install-openrazer: distrobox-check-fedora
       openrazer-meta \
       razergenie && \
     distrobox-export --app razergenie' && \
+  mkdir -p ~/.config/systemd/user && \
   wget https://raw.githubusercontent.com/ublue-os/bazzite/main/post_install_files/OpenRazer/openrazer-daemon.service -O ~/.config/systemd/user/openrazer-daemon.service && \
   systemctl --user daemon-reload && \
   systemctl enable --user openrazer-daemon.service && \
@@ -152,6 +153,8 @@ install-opentabletdriver:
 # Create fedora distrobox if it doesn't exist
 [private]
 distrobox-check-fedora:
-  if grep -qvz "fedora" <<< $(distrobox list); then \
-    /usr/bin/ujust distrobox-fedora; \
-  fi
\ No newline at end of file
+  #!/bin/env bash
+  if grep -qvz "fedora" <<< $(distrobox list); then
+    echo "Setting up Fedora distrobox"
+    /usr/bin/ujust distrobox-fedora
+  fi