diff --git a/blfsSetup.sh b/blfsSetup.sh
index cf51031..8cf3d96 100755
--- a/blfsSetup.sh
+++ b/blfsSetup.sh
@@ -16,9 +16,6 @@ _build_blfs()
     # Setup autologin
     local dir_lfs="$(realpath "$1")"
     _setup_autologin "$dir_lfs" || return 1
-        
-    # Create new blfs config
-    _create_blfs_config "$dir_lfs" || return 1
 
     # Create autologin script to run blfs build after reboot
     _create_blfs_builder_script "$dir_lfs" || return 1
@@ -28,4 +25,4 @@ _build_blfs()
 }
 
 # Shutdown on failure
-_build_blfs "$1" "$2" || sudo shutdown --poweroff +5
\ No newline at end of file
+_build_blfs "$1" "$2" || sudo shutdown --poweroff +5
diff --git a/libs/func_general.sh b/libs/func_general.sh
index 6c04963..9608130 100644
--- a/libs/func_general.sh
+++ b/libs/func_general.sh
@@ -144,7 +144,6 @@ _finalize_lfs_build()
 
     # Move blfs folder to pkr home folder
     sudo mv -v "$dir_lfs/blfs_root" "$dir_lfs/home/pkr/" &&
-    sudo chroot "$dir_lfs" sed -i -E "/(=configuration|python3)/s/^/#/g;/=configuration/i\	source /home/pkr/custom_blfs_packages/libs/func_general.sh && _create_blfs_config_xorg /" /home/pkr/blfs_root/Makefile &&
     sudo chroot "$dir_lfs" chown -hR pkr:pkr "/home/pkr/blfs_root" &&
     sudo chroot "$dir_lfs" chown -hR pkr:pkr "/var/lib/jhalfs" &&
     sudo sed -i "s|/blfs_root/packdesc.dtd|/home/pkr/blfs_root/packdesc.dtd|g" "$dir_lfs/var/lib/jhalfs/BLFS/instpkg.xml"
@@ -351,6 +350,7 @@ _build_blfs()
     cd "$dir_blfs_root"
     make clean &&
     make update &&
+    sed -i -E "/(=configuration|python3)/s/^/#/g;/=configuration/i\	source /home/pkr/custom_blfs_packages/libs/func_general.sh && _create_blfs_config_xorg /" "$dir_blfs_root/Makefile" &&
     make <<< yes &&
     cd "$dir_blfs_work" &&
     ../gen-makefile.sh &&