diff --git a/Containerfile b/Containerfile
index 03fcecdd..04051617 100644
--- a/Containerfile
+++ b/Containerfile
@@ -408,6 +408,7 @@ RUN /tmp/image-info.sh && \
     sed -i 's@Exec=discover-overlay@Exec=/usr/bin/bazzite-discover-overlay@g' /usr/etc/xdg/autostart/discover_overlay.desktop && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/discover_overlay.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
+    echo "import \"/usr/share/ublue-os/just/70-bazzite.just\"" >> /usr/share/ublue-os/justfile" && \
     pip install --prefix=/usr yafti && \
     pip install --prefix=/usr hyfetch && \
     sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just b/system_files/deck/shared/usr/share/ublue-os/just/70-bazzite.just
similarity index 99%
rename from system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
rename to system_files/deck/shared/usr/share/ublue-os/just/70-bazzite.just
index 676e9c10..310fd38f 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/70-bazzite.just
@@ -405,10 +405,6 @@ _toggle_wayland:
 enable-flatpak-theming:
     flatpak override --user --filesystem=xdg-config/gtk-4.0:ro --filesystem=xdg-config/gtk-3.0:ro --filesystem=~/.icons:ro --filesystem=~/.themes:ro
 
-# Enable XwaylandVideoBridge for screensharing under Wayland
-fix-screenshare:
-    cp /usr/share/applications/org.kde.xwaylandvideobridge.desktop $HOME/.config/autostart/
-
 # Add user to "input" group required by certain controller drivers
 add-user-to-input-group:
     #!/usr/bin/bash
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/70-bazzite.just
similarity index 99%
rename from system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just
rename to system_files/desktop/shared/usr/share/ublue-os/just/70-bazzite.just
index 7c3fe082..0a13112f 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/70-bazzite.just
@@ -182,10 +182,6 @@ unhide-grub:
 enable-flatpak-theming:
     flatpak override --user --filesystem=xdg-config/gtk-4.0:ro --filesystem=xdg-config/gtk-3.0:ro --filesystem=~/.icons:ro --filesystem=~/.themes:ro
 
-# Enable XwaylandVideoBridge for screensharing under Wayland
-fix-screenshare:
-    cp /usr/share/applications/org.kde.xwaylandvideobridge.desktop $HOME/.config/autostart/
-
 # Add user to "input" group required by certain controller drivers
 add-user-to-input-group:
     #!/usr/bin/bash