diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 55defb7..b80e74e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,27 +56,35 @@ jobs:
           set_var PRE_RELEASE "$([[ -z $RELEASE_TYPE ]] && echo false || echo true)"
           set_var RELEASE_TYPE "$([[ -z $RELEASE_TYPE ]] && echo release || echo $RELEASE_TYPE)"
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+      - name: Upload to CurseForge
+        uses: Kir-Antipov/mc-publish@v2.1
         with:
-          name: ${{ env.MOD_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}.jar
-          path: ${{ env.JAR_FILE }}
+          curseforge-id: 489843
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-      - name: Upload to GitHub
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
           files: ${{ env.JAR_FILE }}
-          prerelease: ${{ env.PRE_RELEASE }}
+          name: ${{ env.MOD_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}
+          version: ${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}
+          version-type: ${{ env.RELEASE_TYPE }}
+          changelog-file: CHANGELOG.md
 
-      - name: Upload to CurseForge and Modrinth
+          loaders: forge
+          game-versions: ${{ env.MINECRAFT_VERSION }}
+          version-resolver: exact
+          dependencies: |
+            applied-energistics-2 | depends | *
+            jei | suggests | *
+            crafttweaker | suggests | *
+            kubejs | suggests | *
+          java: 17
+          retry-attempts: 2
+          retry-delay: 10000
+
+      - name: Upload to Modrinth
         uses: Kir-Antipov/mc-publish@v2.1
         with:
           modrinth-id: 7mmL0PW9
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          curseforge-id: 489843
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
           files: ${{ env.JAR_FILE }}
           name: ${{ env.MOD_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}
@@ -86,10 +94,24 @@ jobs:
 
           loaders: forge
           game-versions: ${{ env.MINECRAFT_VERSION }}
+          version-resolver: exact
           dependencies: |
-            applied-energistics-2 | depends
-            jei | suggests
-            crafttweaker | suggests
-            kubejs | suggests
+            ae2 | depends | *
+            kubejs | suggests | *
+          java: 17
           retry-attempts: 2
           retry-delay: 10000
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.MOD_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}.jar
+          path: ${{ env.JAR_FILE }}
+
+      - name: Upload to GitHub
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: ${{ env.JAR_FILE }}
+          prerelease: ${{ env.PRE_RELEASE }}