diff --git a/.github/20/pull_request.yml b/.github/20/pull_request.yml
deleted file mode 100644
index 9cc494eaa..000000000
--- a/.github/20/pull_request.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Pull Request Check
-on: workflow_call
-
-jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/20/gametest.yml
-  build:
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: true
-      PR_BUILD: true
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-forge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: |
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
\ No newline at end of file
diff --git a/.github/20/release.yml b/.github/20/release.yml
deleted file mode 100644
index 17c181da4..000000000
--- a/.github/20/release.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-name: Upload Release Asset
-on: workflow_call
-
-jobs:
-  build:
-    permissions: write-all
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: false
-      PR_BUILD: false
-      VERSION_TYPE: ${{ github.event.release.prerelease && 'alpha' || 'release' }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-forge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v3.1.1
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: |
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
-
-      - name: Publish to maven
-        run: ./gradlew publish
-        env:
-          MAVEN_URL: ${{ secrets.MAVEN_URL }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        continue-on-error: true
-
-      - name: Upload Release Jar
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          files: |
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
-
-      - name: publish forge mc mod
-        uses: Kir-Antipov/mc-publish@v3.3
-        continue-on-error: true
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} For Forge v${{ steps.version.outputs.version }}"
-          version: ${{ steps.version.outputs.version }}
-          game-versions: 1.20.1
-          version-type: ${{ env.VERSION_TYPE }}
-          java: 17
-          fail-mode: skip
-          changelog: ${{ github.event.release.body }}
-
-          modrinth-id: vuISAWPc
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: true
-
-          curseforge-id: 986251
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          files: |
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}-sources.jar
-
-
-      - name: publish fabric mc mod
-        uses: Kir-Antipov/mc-publish@v3.3
-        continue-on-error: true
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} For Fabric v${{ steps.version.outputs.version }}"
-          version: ${{ steps.version.outputs.version }}
-          game-versions: 1.20.1
-          version-type: ${{ env.VERSION_TYPE }}
-          java: 17
-          fail-mode: skip
-          changelog: ${{ github.event.release.body }}
-
-          modrinth-id: vuISAWPc
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: true
-
-          curseforge-id: 986251
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          files: |
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}-sources.jar
diff --git a/.github/21/ci.yml b/.github/21/ci.yml
deleted file mode 100644
index 9299dee74..000000000
--- a/.github/21/ci.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: CI for AnvilCraftMod 1.21.1+
-on: workflow_call
-
-jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/21/gametest.yml
-  build:
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: true
-      PR_BUILD: false
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-neoforge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
-
-      - name: Publish to maven
-        if: ${{ github.event.inputs.publish == 'true' }}
-        run: ./gradlew publish
-        env:
-          MAVEN_URL: ${{ secrets.MAVEN_URL }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        continue-on-error: true
diff --git a/.github/21/pull_request.yml b/.github/21/pull_request.yml
deleted file mode 100644
index d6bd2cf17..000000000
--- a/.github/21/pull_request.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: CI for AnvilCraftMod 1.21.1+
-on: workflow_call
-
-jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/21/gametest.yml
-  build:
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: true
-      PR_BUILD: true
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-neoforge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
diff --git a/.github/21/release.yml b/.github/21/release.yml
deleted file mode 100644
index 32eff237a..000000000
--- a/.github/21/release.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-name: CI for AnvilCraftMod 1.21.1+
-on: workflow_call
-
-jobs:
-  build:
-    permissions: write-all
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: false
-      PR_BUILD: false
-      VERSION_TYPE: ${{ github.event.release.prerelease && 'alpha' || 'release' }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-neoforge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
-
-      - name: Publish to maven
-        if: ${{ github.event.inputs.publish == 'true' }}
-        run: ./gradlew publish
-        env:
-          MAVEN_URL: ${{ secrets.MAVEN_URL }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        continue-on-error: true
-
-      - name: publish neoforge mc mod
-        uses: Kir-Antipov/mc-publish@v3.3
-        continue-on-error: true
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} For NeoForge v${{ steps.version.outputs.version }}"
-          version: ${{ steps.version.outputs.version }}
-          game-versions: 1.21.1
-          version-type: ${{ env.VERSION_TYPE }}
-          java: 21
-          fail-mode: skip
-          changelog: ${{ github.event.release.body }}
-
-          modrinth-id: vuISAWPc
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: true
-
-          curseforge-id: 986251
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          files: |
-            build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
-            build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}-sources.jar
diff --git a/.github/workflows/20/ci/action.yml b/.github/workflows/20/ci/action.yml
deleted file mode 100644
index 9f6a0a84e..000000000
--- a/.github/workflows/20/ci/action.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: CI for AnvilCraftMod 1.20.1-
-on: workflow_call
-
-
-jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/20/gametest
-  build:
-    runs-on: ubuntu-latest
-    env:
-      CI_BUILD: true
-      PR_BUILD: false
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'mod_id mod_name java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build
-        run: ./gradlew build
-
-      - name: Get Version
-        id: version
-        run: |
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F '${{ steps.properties.outputs.mod_id }}-forge-|.jar' '{print $2}')
-          echo "version=$MESSAGE" >> $GITHUB_OUTPUT
-
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
-          path: |
-            fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
-
-      - name: Publish to maven
-        run: ./gradlew publish
-        env:
-          MAVEN_URL: ${{ secrets.MAVEN_URL }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        continue-on-error: true
diff --git a/.github/workflows/20/gametest/action.yml b/.github/workflows/20/gametest/action.yml
deleted file mode 100644
index 5d1458e8b..000000000
--- a/.github/workflows/20/gametest/action.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: GameTest
-on: workflow_call
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Run Fabric GameTest
-        run: ./gradlew anvilcraft-fabric:runGameTestServer
-
-      - name: Run Forge GameTest
-        run: ./gradlew anvilcraft-forge:runGameTestServer
diff --git a/.github/20/ci.yml b/.github/workflows/20_ci.yml
similarity index 97%
rename from .github/20/ci.yml
rename to .github/workflows/20_ci.yml
index 6a8280aed..0eeaa2220 100644
--- a/.github/20/ci.yml
+++ b/.github/workflows/20_ci.yml
@@ -5,7 +5,7 @@ on: workflow_call
 jobs:
   gametest:
     secrets: inherit
-    uses: ./.github/workflows/20/gametest.yml
+    uses: ./.github/workflows/20_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
diff --git a/.github/20/gametest.yml b/.github/workflows/20_gametest.yml
similarity index 96%
rename from .github/20/gametest.yml
rename to .github/workflows/20_gametest.yml
index 5d1458e8b..f1fd3ebd2 100644
--- a/.github/20/gametest.yml
+++ b/.github/workflows/20_gametest.yml
@@ -1,4 +1,4 @@
-name: GameTest
+name: GameTest for AnvilCraftMod 1.20.1-
 on: workflow_call
 
 jobs:
diff --git a/.github/workflows/20/pull_request/action.yml b/.github/workflows/20_pull_request.yml
similarity index 94%
rename from .github/workflows/20/pull_request/action.yml
rename to .github/workflows/20_pull_request.yml
index a9ac0c7df..fadfb55d3 100644
--- a/.github/workflows/20/pull_request/action.yml
+++ b/.github/workflows/20_pull_request.yml
@@ -1,10 +1,10 @@
-name: Pull Request Check
+name: Pull Request Check for AnvilCraftMod 1.20.1-
 on: workflow_call
 
 jobs:
   gametest:
     secrets: inherit
-    uses: ./.github/workflows/20/gametest
+    uses: ./.github/workflows/20_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
diff --git a/.github/workflows/20/release/action.yml b/.github/workflows/20_release.yml
similarity index 98%
rename from .github/workflows/20/release/action.yml
rename to .github/workflows/20_release.yml
index 17c181da4..32b85fb4e 100644
--- a/.github/workflows/20/release/action.yml
+++ b/.github/workflows/20_release.yml
@@ -1,4 +1,4 @@
-name: Upload Release Asset
+name: Upload Release Asset for AnvilCraftMod 1.20.1-
 on: workflow_call
 
 jobs:
diff --git a/.github/workflows/21/gametest/action.yml b/.github/workflows/21/gametest/action.yml
deleted file mode 100644
index 4f40f0d4e..000000000
--- a/.github/workflows/21/gametest/action.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: GameTest
-on: workflow_call
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Run GameTest
-        run: ./gradlew runGameTestServer
diff --git a/.github/workflows/21/ci/action.yml b/.github/workflows/21_ci.yml
similarity index 97%
rename from .github/workflows/21/ci/action.yml
rename to .github/workflows/21_ci.yml
index 48b2238ec..6389c9250 100644
--- a/.github/workflows/21/ci/action.yml
+++ b/.github/workflows/21_ci.yml
@@ -4,7 +4,7 @@ on: workflow_call
 jobs:
   gametest:
     secrets: inherit
-    uses: ./.github/workflows/21/gametest
+    uses: ./.github/workflows/21_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
diff --git a/.github/21/gametest.yml b/.github/workflows/21_gametest.yml
similarity index 95%
rename from .github/21/gametest.yml
rename to .github/workflows/21_gametest.yml
index 4f40f0d4e..56a278332 100644
--- a/.github/21/gametest.yml
+++ b/.github/workflows/21_gametest.yml
@@ -1,4 +1,4 @@
-name: GameTest
+name: GameTest for AnvilCraftMod 1.21.1+
 on: workflow_call
 
 jobs:
diff --git a/.github/workflows/21/pull_request/action.yml b/.github/workflows/21_pull_request.yml
similarity index 94%
rename from .github/workflows/21/pull_request/action.yml
rename to .github/workflows/21_pull_request.yml
index 4f18c994a..c94249ce6 100644
--- a/.github/workflows/21/pull_request/action.yml
+++ b/.github/workflows/21_pull_request.yml
@@ -1,10 +1,10 @@
-name: CI for AnvilCraftMod 1.21.1+
+name: Pull Request Check for AnvilCraftMod 1.21.1+
 on: workflow_call
 
 jobs:
   gametest:
     secrets: inherit
-    uses: ./.github/workflows/21/gametest
+    uses: ./.github/workflows/21_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
diff --git a/.github/workflows/21/release/action.yml b/.github/workflows/21_release.yml
similarity index 98%
rename from .github/workflows/21/release/action.yml
rename to .github/workflows/21_release.yml
index 32eff237a..45130843d 100644
--- a/.github/workflows/21/release/action.yml
+++ b/.github/workflows/21_release.yml
@@ -1,4 +1,4 @@
-name: CI for AnvilCraftMod 1.21.1+
+name: Upload Release Asset for AnvilCraftMod 1.21.1+
 on: workflow_call
 
 jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d6f83ac7a..636934202 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      ci_version: ${{ steps.properties.outputs.ci_version }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -30,10 +32,12 @@ jobs:
           path: gradle.properties
           properties: 'ci_version'
 
-      - name: build-20
-        if: ${{ steps.properties.outputs.ci_version == '20' }}
-        uses: ./.github/workflows/20/ci
+  build-20:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '20' }}
+    uses: ./.github/workflows/20_ci.yml
 
-      - name: build-21
-        if: ${{ steps.properties.outputs.ci_version == '21' }}
-        uses: ./.github/workflows/21/ci
+  build-21:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '21' }}
+    uses: ./.github/workflows/21_ci.yml
\ No newline at end of file
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 4f7b1dc55..c47c6e0e4 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -16,6 +16,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      ci_version: ${{ steps.properties.outputs.ci_version }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -30,10 +32,12 @@ jobs:
           path: gradle.properties
           properties: 'ci_version'
 
-      - name: build-20
-        if: ${{ steps.properties.outputs.ci_version == '20' }}
-        uses: ./.github/workflows/20/pull_request
+  build-20:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '20' }}
+    uses: ./.github/workflows/20_pull_request.yml
 
-      - name: build-21
-        if: ${{ steps.properties.outputs.ci_version == '21' }}
-        uses: ./.github/workflows/21/pull_request
+  build-21:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '21' }}
+    uses: ./.github/workflows/21_pull_request.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 17567b568..d9e664dc3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      ci_version: ${{ steps.properties.outputs.ci_version }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -21,10 +23,12 @@ jobs:
           path: gradle.properties
           properties: 'ci_version'
 
-      - name: build-20
-        if: ${{ steps.properties.outputs.ci_version == '20' }}
-        uses: ./.github/workflows/20/release
+  build-20:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '20' }}
+    uses: ./.github/workflows/20_release.yml
 
-      - name: build-21
-        if: ${{ steps.properties.outputs.ci_version == '21' }}
-        uses: ./.github/workflows/21/release
+  build-21:
+    needs: build
+    if: ${{ needs.build.outputs.ci_version == '21' }}
+    uses: ./.github/workflows/21_release.yml