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 f523a0b3..a97de6bc 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
@@ -84,28 +84,19 @@ reset-bazzite-arch:
   /usr/bin/ujust install-bazzite-arch
 
 # 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 \
@@ -121,10 +112,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' && \
@@ -133,10 +121,7 @@ install-solaar:
   cp ~/.local/share/applications/fedora-solaar.desktop ~/.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' && \
@@ -147,10 +132,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'
@@ -166,3 +148,10 @@ 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:
+  if grep -qvz "fedora" <<< $(distrobox list); then \
+    /usr/bin/ujust distrobox-fedora; \
+  fi
\ No newline at end of file