diff --git a/TODO.md b/TODO.md
index 4e55719..61c43cd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,7 +10,7 @@
 | MET-006 |   Ready  | Build the initial Gradle project and run its tests; resolve build setup issues before removing the existing Maven build. |
 | MET-007 |   Ready  | Update .gitignore for Gradle and remove obsolete Maven and Eclipse project files after the Gradle build succeeds. |
 | MET-008 |   Done   | Analyze Java sources for deprecated or removed Bukkit/Paper APIs and legacy patterns, including logging, event registration, configuration, player lookup, and player-keyed storage. |
-| MET-009 |   Ready  | Review custom scripts and resources for required updates to the Gradle build and modern Paper server workflow. |
+| MET-009 |   Done   | Review custom scripts and resources for required updates to the Gradle build and modern Paper server workflow. |
 | MET-010 |   Ready  | Refactor plugin logging to use JavaPlugin.getLogger(). |
 | MET-011 |   Ready  | Refactor event listeners and registration to use Listener, @EventHandler, and the modern plugin manager API. |
 | MET-012 |   Ready  | Replace deprecated configuration APIs with the modern Bukkit/Paper configuration API, including load, save, and reload behavior. |
diff --git a/tools/build-plugin.sh b/tools/build-plugin.sh
index 6136d0d..7907d49 100755
--- a/tools/build-plugin.sh
+++ b/tools/build-plugin.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 
 # Find project root (one directory above this script)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -7,8 +7,4 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 cd "$PROJECT_ROOT"
 
-if [[ -x ./mvnw ]]; then
-  ./mvnw package
-else
-  mvn package
-fi
+exec ./gradlew build "$@"
diff --git a/tools/publish-local.sh b/tools/publish-local.sh
index d5fc9a0..e0921fb 100755
--- a/tools/publish-local.sh
+++ b/tools/publish-local.sh
@@ -42,8 +42,4 @@ ensure_java_25() {
 
 ensure_java_25
 cd "$PROJECT_ROOT"
-if [[ -x ./mvnw ]]; then
-  ./mvnw install -DskipTests "$@"
-else
-  mvn install -DskipTests "$@"
-fi
+exec ./gradlew publishToMavenLocal "$@"