diff --git a/stage3/02-setup-system/00-run.sh b/stage3/02-setup-system/00-run.sh
index 3297401..321adc4 100755
--- a/stage3/02-setup-system/00-run.sh
+++ b/stage3/02-setup-system/00-run.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
-# polkit fixes
-install -m 644 files/polkit-admin.conf "${ROOTFS_DIR}/etc/polkit-1/localauthority.conf.d/51-admin.conf"
-
-# Include custom vendor file for gnome-inital-setup
-mkdir -p "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
-install -m 644 files/vendor.conf "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
+# Create required directorys and profiles for dconf
+mkdir -p "${ROOTFS_DIR}/etc/dconf/profile"
+mkdir -p "${ROOTFS_DIR}/etc/dconf/db/local.d"
+mkdir -p "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d"
+install -m 644 files/dconf-profile "${ROOTFS_DIR}/etc/dconf/profile/user"
+install -m 644 files/dconf-profile-initial-setup "${ROOTFS_DIR}/etc/dconf/profile/gnome-initial-setup"
 
 # Configure default GDM3 Session to Xorg
 mkdir -p "${ROOTFS_DIR}/var/lib/gdm"
@@ -14,25 +14,30 @@ sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/gdm3/daemon.conf
 touch /var/lib/gdm/run-initial-setup
 EOF
 
-# Create required directorys for dconf
-mkdir -p "${ROOTFS_DIR}/etc/dconf/db/local.d"
-mkdir -p "${ROOTFS_DIR}/etc/dconf/profile"
-install -m 644 files/dconf-profile "${ROOTFS_DIR}/etc/dconf/profile/user"
+# polkit fixes
+install -m 644 files/polkit-admin.conf "${ROOTFS_DIR}/etc/polkit-1/localauthority.conf.d/51-admin.conf"
+
+# Include custom vendor file for gnome-inital-setup
+mkdir -p "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
+install -m 644 files/vendor.conf "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
 
 # Set default gnome-extensions
 install -m 644 files/gnome-extensions "${ROOTFS_DIR}/etc/dconf/db/local.d/00-extensions"
 
-# Set default Wallpaper
+# Install wallpapers
 mkdir -p "${ROOTFS_DIR}/usr/local/share/backgrounds"
 install -m 644 files/loveimage.png "${ROOTFS_DIR}/usr/local/share/backgrounds/loveimage.png"
 install -m 644 files/neon-forest.png "${ROOTFS_DIR}/usr/local/share/backgrounds/neon-forest.png"
 
+# Set default settings (gnome-initial-setup)
+install -m 644 files/gnome-initial-setup "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d/00-default-settings"
+
 # Set default gnome settings
 install -m 644 files/gnome-default-settings "${ROOTFS_DIR}/etc/dconf/db/local.d/00-default-settings"
 
-# Run the dconf update as the first user
+# Update all dconf databases
 on_chroot << EOF
-SUDO_USER="${FIRST_USER_NAME}" dconf update
+dconf update
 EOF
 
 # Remove setup user (only if it's not a system account)
@@ -40,4 +45,4 @@ on_chroot << EOF
 if [ "${FIRST_USER_ISSYSTEM}" = "false" ]; then
     deluser --remove-home --remove-all-files ${FIRST_USER_NAME}
 fi
-EOF
+EOF
\ No newline at end of file