diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index 9ddd383f..c7e2a5a5 100755
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -59,9 +59,9 @@ function runSetup
 
         and echo "Cloning project..."
         and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
-        runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
-        and runHook --force bootstrapSetup "Please set up a function `bootstrapSetup` for installing `fish` into the "
         and runHook setupOS
+        and runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
+        and runHook --force bootstrapSetup "Please set up a function `bootstrapSetup` for installing `fish` into the "
 
         and echo "Preparing auto-login..."
         and runHook --force autologin "Please set up a function `autologin` for  setting up autologin for the `root` user"