diff --git a/code/tools/build_swift_munki.sh b/code/tools/build_swift_munki.sh
new file mode 100755
index 00000000..d18f69b7
--- /dev/null
+++ b/code/tools/build_swift_munki.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+check_exit_code() {
+    if [ "$1" != "0" ]; then
+        echo "$2: $1" 1>&2
+        exit 1
+    fi
+}
+
+SWIFT_MUNKI_DIR="./cli/munki"
+
+for TOOL in managedsoftwareupdate makecatalogs makepkginfo munkiimport removepackages app_usage_monitor appusaged launchapp iconimporter repoclean ; do
+    xcodebuild -project "$SWIFT_MUNKI_DIR/munki.xcodeproj" -scheme $TOOL build
+    check_exit_code "$?" "Error building $TOOL"
+done
diff --git a/code/tools/build_swift_munki.zsh b/code/tools/build_swift_munki.zsh
deleted file mode 100755
index 56679a8d..00000000
--- a/code/tools/build_swift_munki.zsh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/zsh
-
-check_exit_code() {
-    if [ "$1" != "0" ]; then
-        echo "$2: $1" 1>&2
-        exit 1
-    fi
-}
-
-SWIFT_MUNKI_DIR="./cli/munki"
-
-# Build makecatalogs
-xcodebuild -project "$SWIFT_MUNKI_DIR/munki.xcodeproj" -scheme makecatalogs build
-check_exit_code "$?" "Error building makecatalogs"
-
-# Build makepkginfo
-xcodebuild -project "$SWIFT_MUNKI_DIR/munki.xcodeproj" -scheme makepkginfo build
-check_exit_code "$?" "Error building makepkginfo"