diff --git a/config/updateall/scripts/10-apt b/config/updateall/scripts/10-apt
index 56ef1b8..ddec5e4 100755
--- a/config/updateall/scripts/10-apt
+++ b/config/updateall/scripts/10-apt
@@ -1,5 +1,7 @@
-#!/bin/sh -ex
-[ "$(whoami)" != root ] && exec sudo "$0" "$@"
+#!/usr/bin/env sh
+[ "$(whoami)" != root ] && exec sudo -- "$0" "$@"
+
+set -x -e
 apt-get clean
 apt-get update
 apt-file update
diff --git a/config/updateall/scripts/10-arch b/config/updateall/scripts/10-arch
index d06bb46..525bacc 100755
--- a/config/updateall/scripts/10-arch
+++ b/config/updateall/scripts/10-arch
@@ -1,8 +1,7 @@
 #!/usr/bin/env sh
-set -x -e
-
 [ "$(whoami)" != root ] && exec sudo -- "$0" "$@"
 
+set -e -x
 aura -Cc 0
 aura -Cv
 aura -Fy
diff --git a/config/updateall/scripts/10-pkg b/config/updateall/scripts/10-pkg
deleted file mode 100755
index 9b4b89f..0000000
--- a/config/updateall/scripts/10-pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -ex
-apt clean
-pkg update
-pkg upgrade
-apt autopurge -y
diff --git a/config/updateall/scripts/50-docker b/config/updateall/scripts/50-docker
index c7fb9aa..3030412 100755
--- a/config/updateall/scripts/50-docker
+++ b/config/updateall/scripts/50-docker
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
-
 cd ~/docker || exit
 
 for i in *; do (set -e
diff --git a/config/updateall/scripts/50-waydroid b/config/updateall/scripts/50-waydroid
index 50a2686..844ac98 100755
--- a/config/updateall/scripts/50-waydroid
+++ b/config/updateall/scripts/50-waydroid
@@ -1,2 +1,3 @@
-#!/bin/sh -ex
-sudo waydroid upgrade
+#!/usr/bin/env sh
+set -x
+exec sudo waydroid upgrade
diff --git a/config/updateall/scripts/50-yabridge b/config/updateall/scripts/50-yabridge
index 915a4f0..9bbe577 100755
--- a/config/updateall/scripts/50-yabridge
+++ b/config/updateall/scripts/50-yabridge
@@ -1,2 +1,3 @@
-#!/bin/sh -ex
-yabridgectl sync
+#!/usr/bin/env sh
+set -x
+exec yabridgectl sync
diff --git a/config/updateall/scripts/70-git b/config/updateall/scripts/70-git
index 2532e5c..3e863b1 100755
--- a/config/updateall/scripts/70-git
+++ b/config/updateall/scripts/70-git
@@ -1,25 +1,20 @@
-#!/bin/sh -x
-
-if [ -z "$SSH_AGENT_PID" ]; then
-    exec ssh-agent "$0" "$@"
-fi
-
+#!/usr/bin/env sh
+[ -z "$SSH_AGENT_PID" ] && exec ssh-agent -- "$0" "$@"
 ssh-add
 
 update_repo() {
-    cd "$1" || return
+    cd -- "$1" || return
     printf 'Updating repository \033[1m%s\033[0m...\n' "$1"
     git pull
 }
 
 cd ~/git || exit
 
-set +x
 for i in *; do
     while [ "$(jobs -p | wc -l)" -ge 4 ]; do
         sleep 1
     done
+
     update_repo "$i" &
 done
-
 wait
diff --git a/config/updateall/scripts/80-nvim b/config/updateall/scripts/80-nvim
index d5d9a29..1e50d68 100755
--- a/config/updateall/scripts/80-nvim
+++ b/config/updateall/scripts/80-nvim
@@ -1,2 +1,3 @@
-#!/bin/sh -x
-nvim +PaqSync
+#!/usr/bin/env sh
+set -x
+exec nvim +PaqSync