diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 7d82bd9..e2dba1b 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -1,9 +1,23 @@
 #!/usr/bin/env sh
 
-echo "Updating push-url to use ssh"
+echo "Loading environment variables"
+. "$HOME/.config/environment"
+
+echo "Configuring yadm"
+yadm gitconfig core.bare false
+yadm gitconfig core.worktree "$HOME"
+yadm gitconfig status.showUntrackedFiles no
 yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git"
 
-echo "Autoinstall base"
-autoinstall base
+if [ ! -x "$(command -v autoinstall)" ];
+then
+  echo "Installing autoinstall command"
+  mkdir -p "$HOME/.local/bin"
+  curl -Lo "$HOME/.local/bin/autoinstall" https://git.serguzim.me/serguzim/tools/releases/download/latest/autoinstall
+  chmod +x "$HOME/.local/bin/autoinstall"
+fi
+
+echo "Autoinstalling base"
+autoinstall run base
 
 echo "Don't forget to decrypt yadm secrets"