diff --git a/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just b/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
index 8338e44c1f..7045131289 100644
--- a/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
+++ b/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
@@ -2,8 +2,12 @@
 
 # Restore Bazzite customized DE settings
 restore-gnome-de-settings:
-    dconf load / < /usr/share/ublue-os/dconfs/desktop-silverblue/
-    dconf load / < /usr/share/ublue-os/dconfs/deck-silverblue/
+    for file in /usr/share/ublue-os/dconfs/desktop-silverblue/*; do
+        dconf load / < "${file}"
+    done
+    for file in /usr/share/ublue-os/dconfs/deck-silverblue/*; do
+        dconf load / < "${file}"
+    done
 
 # Restore Bazzite customized applications folders
 restore-gnome-folders:
diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup
index 4953afea28..f8a2146e2f 100755
--- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup
@@ -77,7 +77,8 @@ fi
 if [[ ! -f "$BAZZITE_CONFIG_DIR/ptyxis-initialized" ]]; then
   echo 'Configuring Ptyxis'
   if [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
-    dconf load / < /usr/share/ublue-os/dconfs/desktop-kinoite/
+    dconf load / < /usr/share/ublue-os/dconfs/desktop-kinoite/zz0-00-bazzite-desktop-kinoite-global
+    dconf load / < /usr/share/ublue-os/dconfs/desktop-kinoite/00-bazzite-desktop-kinoite-ptyxis
   fi
   touch "$BAZZITE_CONFIG_DIR/ptyxis-initialized"
 fi
diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just b/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
index 3474cc5aac..4f171fe980 100644
--- a/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
+++ b/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
@@ -2,7 +2,9 @@
 
 # Restore Bazzite customized DE settings
 restore-gnome-de-settings:
-    dconf load / < /usr/share/ublue-os/dconfs/desktop-silverblue/
+    for file in /usr/share/ublue-os/dconfs/desktop-silverblue/*; do
+        dconf load / < "${file}"
+    done
 
 # Restore Bazzite customized applications folders
 restore-gnome-folders: