diff --git a/bash/bootstrap.sh b/bash/bootstrap.sh
index 9dfaa801..6bfa57e3 100755
--- a/bash/bootstrap.sh
+++ b/bash/bootstrap.sh
@@ -34,7 +34,7 @@ else
     exit 1
 fi
 
-$dwnld_cmd https://github.com/nathanchance/env/tarball/main | tar -C "$tmp_dir" -xvzf - --strip-components=1
+$dwnld_cmd https://github.com/nathanchance/env/tarball/nspawn | tar -C "$tmp_dir" -xvzf - --strip-components=1
 
 python_setup=$tmp_dir/python/setup
 if [ ! -d "$python_setup" ]; then
diff --git a/fish/functions/user_setup.fish b/fish/functions/user_setup.fish
index 2bd64453..5520505f 100644
--- a/fish/functions/user_setup.fish
+++ b/fish/functions/user_setup.fish
@@ -153,7 +153,8 @@ function user_setup -d "Setup a user account, downloading all files and placing
             git clone https://github.com/nathanchance/(basename $ENV_FOLDER).git $ENV_FOLDER; or return
         end
     end
-    git -C $ENV_FOLDER pull
+    git -C $ENV_FOLDER remote update origin
+    git -C $ENV_FOLDER reset --hard origin/nspawn
 
     # Download and update forked fisher plugins
     set forked_fisher_plugins \
diff --git a/python/lib/setup.py b/python/lib/setup.py
index f00c5cbe..5025139e 100755
--- a/python/lib/setup.py
+++ b/python/lib/setup.py
@@ -168,7 +168,7 @@ def chsh_fish(username):
 
 def clone_env(username):
     if not (env_tmp := Path('/tmp/env')).exists():  # noqa: S108
-        lib.utils.run(['git', 'clone', 'https://github.com/nathanchance/env', env_tmp])
+        lib.utils.run(['git', 'clone', '-b', 'nspawn', 'https://github.com/nathanchance/env', env_tmp])
         chown(username, env_tmp)
 
 
@@ -465,7 +465,7 @@ def setup_initial_fish_config(username):
             '            return 1\n'
             '        end\n'
             '        if not test -d /tmp/env\n'
-            '            git -C /tmp clone -q https://github.com/nathanchance/env\n'
+            '            git -C /tmp clone -b nspawn -q https://github.com/nathanchance/env\n'
             '            or return\n'
             '        end\n'
             '        git -C /tmp/env pull -qr\n'