diff --git a/scripts/install-home-manager.sh b/scripts/install-home-manager.sh
index d7876b9..ae8bf1e 100755
--- a/scripts/install-home-manager.sh
+++ b/scripts/install-home-manager.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 nix-shell '<home-manager>' -A install
 rm ~/.config/nixpkgs/home.nix
 ln -s $(pwd)/.nixos/flake.nix /home/$USER/.config/nixpkgs/flake.nix
diff --git a/scripts/install_new_vm.sh b/scripts/install_new_vm.sh
new file mode 100755
index 0000000..c2e0190
--- /dev/null
+++ b/scripts/install_new_vm.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+read -e -p "Enter a config you want to deploy: " flake
+
+server="nixos@nixos.2li.local"
+download_command="curl https://git.2li.ch/Nebucatnetzer/nixos/archive/master.tar.gz | tar xz"
+install_command="cd ~/nixos && ./scripts/install_vm.sh $flake"
+rsa_key="~/.ssh/id_rsa"
+
+ssh-copy-id $server
+ssh -i $rsa_key -t $server $download_command
+ssh -i $rsa_key -t $server $install_command
diff --git a/scripts/install_new_vm.xsh b/scripts/install_new_vm.xsh
deleted file mode 100755
index 4464e6c..0000000
--- a/scripts/install_new_vm.xsh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env xonsh
-
-flake = input("Enter a config you want to deploy: ")
-
-server = "nixos@nixos.2li.local"
-download_command = "curl https://git.2li.ch/Nebucatnetzer/nixos/archive/master.tar.gz | tar xz"
-install_command = "cd ~/nixos && ./scripts/install_vm.sh " + flake
-rsa_key = "~/.ssh/id_rsa"
-
-ssh-copy-id @(server)
-ssh -i @(rsa_key) -t @(server) @(download_command)
-ssh -i @(rsa_key) -t @(server) @(install_command)
diff --git a/scripts/remote_switch.sh b/scripts/remote_switch.sh
new file mode 100755
index 0000000..8d4bb59
--- /dev/null
+++ b/scripts/remote_switch.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+hosts = (
+ "nixos-management"
+ "grav"
+ "git"
+ "heimdall"
+ "mail"
+ "plex"
+ "proxy"
+ "rss-bridge"
+ "ttrss"
+)
+
+rsa_key="~/.nixos/secrets/ssh_keys/ansible/ansible.key"
+$NIX_SSHOPTS="-t -i $rsa_key"
+
+for host in $hosts do
+    fqdn="$host.2li.local"
+    echo $fqdn
+    nixos-rebuild switch --use-remote-sudo --build-host localhost --target-host $fqdn --flake ".#$host"
+    echo
+    echo
+done
diff --git a/scripts/remote_switch.xsh b/scripts/remote_switch.xsh
deleted file mode 100755
index fbbc69a..0000000
--- a/scripts/remote_switch.xsh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env xonsh
-
-hosts = [
- "nixos-management",
- "grav",
- #"git",
- "heimdall",
- "mail",
- "plex",
- "proxy",
- "rss-bridge",
- "ttrss",
-]
-
-rsa_key = "~/.nixos/secrets/ssh_keys/ansible/ansible.key"
-$NIX_SSHOPTS="-t -i " + rsa_key
-
-for host in hosts:
-    fqdn = "{}.2li.local".format(host)
-    print(fqdn)
-    print("-" * len(fqdn))
-    nixos-rebuild switch --use-remote-sudo --build-host localhost --target-host @(fqdn) --flake @(".#" + host)
-    #echo @(fqdn) @(".#" + host)
-    print("")
-    print("")
diff --git a/scripts/secret_permissions.xsh b/scripts/secret_permissions.sh
similarity index 83%
rename from scripts/secret_permissions.xsh
rename to scripts/secret_permissions.sh
index c0dac33..e19f95b 100755
--- a/scripts/secret_permissions.xsh
+++ b/scripts/secret_permissions.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env xonsh
+#!/usr/bin/env bash
 
 find ./secrets -type d -print0 | xargs -0 chmod 700
 find ./secrets -type f -print0 | xargs -0 chmod 600
diff --git a/scripts/update_all_systems.sh b/scripts/update_all_systems.sh
new file mode 100755
index 0000000..315e6f7
--- /dev/null
+++ b/scripts/update_all_systems.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+hosts = (
+ "nixos-management"
+ "grav"
+ "heimdall"
+ "mail"
+ "plex"
+ "proxy"
+ "rss-bridge"
+ "ttrss"
+)
+
+update_command='tmux new -s updates "cd ~/.nixos && git pull && sudo nixos-rebuild -j auto switch || bash;"'
+rsa_key="~/.nixos/secrets/ssh_keys/ansible/ansible.key"
+
+for host in $hosts do
+    fqdn="$host.2li.local"
+    echo $fqdn
+    ssh -i $rsa_key -t $fqdn $update_command
+    echo
+    echo
+done
diff --git a/scripts/update_all_systems.xsh b/scripts/update_all_systems.xsh
deleted file mode 100755
index 550c2cc..0000000
--- a/scripts/update_all_systems.xsh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env xonsh
-
-hosts = [
- "nixos-management",
- "grav",
- "heimdall",
- "mail",
- "plex",
- "proxy",
- "rss-bridge",
- "ttrss",
-]
-
-update_command = 'tmux new -s updates "cd ~/.nixos && git pull && sudo nixos-rebuild -j auto switch || bash;"'
-rsa_key = "~/.nixos/secrets/ssh_keys/ansible/ansible.key"
-
-for host in hosts:
-    fqdn = "{}.2li.local".format(host)
-    print(fqdn)
-    print("-" * len(fqdn))
-    ssh -i @(rsa_key) -t @(fqdn) @(update_command)
-    print("")
-    print("")