diff --git a/.github/actions/setup-benchstat/action.yml b/.github/actions/setup-benchstat/action.yml
index 3fb5c44..97a346d 100644
--- a/.github/actions/setup-benchstat/action.yml
+++ b/.github/actions/setup-benchstat/action.yml
@@ -33,7 +33,7 @@ inputs:
     description: "Runner OS for cache key (e.g., ubuntu-latest, mac-latest)"
     required: true
   go-version:
-    description: "Go version being used (e.g., 1.24.x, 1.22). Benchstat requires Go 1.23+"
+    description: "Go version being used (e.g., 1.25.x, 1.24). Benchstat requires Go 1.25+"
     required: true
 
 outputs:
@@ -44,14 +44,14 @@ outputs:
     description: "How benchstat was obtained: cached, fresh, or skipped"
     value: ${{ steps.installation-summary.outputs.method }}
   skipped:
-    description: "Whether benchstat installation was skipped due to Go version < 1.23"
+    description: "Whether benchstat installation was skipped due to Go version < 1.25"
     value: ${{ steps.version-check.outputs.skip }}
 
 runs:
   using: "composite"
   steps:
     # --------------------------------------------------------------------
-    # Check Go version compatibility (benchstat requires Go 1.23+)
+    # Check Go version compatibility (benchstat requires Go 1.25+)
     # --------------------------------------------------------------------
     - name: 🔍 Check Go version compatibility
       id: version-check
@@ -67,17 +67,17 @@ runs:
         MINOR=$(echo "$GO_VERSION" | sed -E 's/^[0-9]+\.([0-9]+).*/\1/')
 
         if [ -z "$MAJOR" ] || [ -z "$MINOR" ] || ! [[ "$MAJOR" =~ ^[0-9]+$ ]] || ! [[ "$MINOR" =~ ^[0-9]+$ ]]; then
-          echo "❌ Could not parse Go version '$GO_VERSION'. Please provide a valid Go version (e.g., '1.23', '1.24.x')." >&2
+          echo "❌ Could not parse Go version '$GO_VERSION'. Please provide a valid Go version (e.g., '1.25', '1.26.x')." >&2
           exit 1
         elif [ "$MAJOR" -gt 1 ]; then
-          # Any Go major version > 1 is considered compatible with the 1.23+ requirement
-          echo "✅ Go $GO_VERSION >= 1.23: proceeding with benchstat installation"
+          # Any Go major version > 1 is considered compatible with the 1.25+ requirement
+          echo "✅ Go $GO_VERSION >= 1.25: proceeding with benchstat installation"
           echo "skip=false" >> $GITHUB_OUTPUT
-        elif [ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 23 ]; then
-          echo "⚠️ Go $GO_VERSION < 1.23: skipping benchstat installation (requires Go 1.23+)"
+        elif [ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 25 ]; then
+          echo "⚠️ Go $GO_VERSION < 1.25: skipping benchstat installation (requires Go 1.25+)"
           echo "skip=true" >> $GITHUB_OUTPUT
         else
-          echo "✅ Go $GO_VERSION >= 1.23: proceeding with benchstat installation"
+          echo "✅ Go $GO_VERSION >= 1.25: proceeding with benchstat installation"
           echo "skip=false" >> $GITHUB_OUTPUT
         fi
 
@@ -140,7 +140,7 @@ runs:
       run: |
         # Check if installation was skipped due to Go version
         if [[ "${{ steps.version-check.outputs.skip }}" == "true" ]]; then
-          echo "⏭️ Benchstat installation skipped (Go version < 1.23)"
+          echo "⏭️ Benchstat installation skipped (Go version < 1.25)"
           echo "method=skipped" >> $GITHUB_OUTPUT
           echo "📋 Installation method: Skipped"
           exit 0
diff --git a/.github/env/10-mage-x.env b/.github/env/10-mage-x.env
index 5231c9b..e1fb4d9 100644
--- a/.github/env/10-mage-x.env
+++ b/.github/env/10-mage-x.env
@@ -36,7 +36,7 @@
 # ================================================================================================
 
 # MAGE-X version
-MAGE_X_VERSION=v1.20.8
+MAGE_X_VERSION=v1.20.11
 
 # For mage-x development, set to 'true' to use local version instead of downloading from releases
 MAGE_X_USE_LOCAL=false
@@ -71,7 +71,7 @@ MAGE_X_NANCY_VERSION=v1.2.0
 MAGE_X_STATICCHECK_VERSION=2026.1
 MAGE_X_SWAG_VERSION=v1.16.6
 MAGE_X_YAMLFMT_VERSION=v0.21.0
-MAGE_X_BENCHSTAT_VERSION=v0.0.0-20260211190930-8161c38c6cdc
+MAGE_X_BENCHSTAT_VERSION=v0.0.0-20260312031701-16a31bc5fbd0
 MAGE_X_MAGE_VERSION=v1.16.0
 
 # ================================================================================================
diff --git a/.github/workflows/fortress-test-matrix.yml b/.github/workflows/fortress-test-matrix.yml
index a7cb04f..820e99c 100644
--- a/.github/workflows/fortress-test-matrix.yml
+++ b/.github/workflows/fortress-test-matrix.yml
@@ -177,7 +177,7 @@ jobs:
 
       # --------------------------------------------------------------------
       # Setup benchstat (required for benchmark comparison tests)
-      # Note: benchstat requires Go 1.23+, action will skip for older versions
+      # Note: benchstat requires Go 1.25+, action will skip for older versions
       # --------------------------------------------------------------------
       - name: 📊 Setup benchstat
         uses: ./.github/actions/setup-benchstat