diff --git a/.github/workflows/auto_build.yml b/.github/workflows/auto_build.yml
index 61fdd9cc..0ff1e82f 100644
--- a/.github/workflows/auto_build.yml
+++ b/.github/workflows/auto_build.yml
@@ -3,7 +3,7 @@ name: auto-build
 on:
   push:
     branches:
-      - '1.20.1'
+      - '1.21'
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Validate Gradle wrapper
@@ -35,7 +35,7 @@ jobs:
       - name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-forge-|.jar' '{print $2}')
+          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-|.jar' '{print $2}')
           echo version=$MESSAGE >> $GITHUB_OUTPUT
 
       - name: release
diff --git a/.github/workflows/auto_publish.yml b/.github/workflows/auto_publish.yml
index 8862741c..6726609f 100644
--- a/.github/workflows/auto_publish.yml
+++ b/.github/workflows/auto_publish.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Validate Gradle wrapper
@@ -95,7 +95,7 @@ jobs:
             gtceu{modrinth:7tG215v7}{curseforge:890405}
           game-version-filter: none
           java: |
-            17
+            21
           retry-attempts: 2
           retry-delay: 10000
           fail-mode: fail
diff --git a/build.gradle b/build.gradle
index 61facb08..5a516707 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ repositories {
 
 
 base {
-    archivesName = mod_id
+    archivesName = "${project.name}-${libs.versions.minecraft.get()}"
 }
 
 // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.