diff --git a/.github/workflows/gradle.yml b/.github/workflows/build.yml
similarity index 99%
rename from .github/workflows/gradle.yml
rename to .github/workflows/build.yml
index 65e91520..16248f30 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/build.yml
@@ -26,29 +26,37 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
+
     - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
         java-version: '8'
         distribution: 'zulu'
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
         distribution: 'adopt'
+
     - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         java-version: '21'
         distribution: 'adopt'
+
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
+
     - name: Change wrapper permissions
       run: chmod +x ./gradlew
+
     - name: Build with Gradle
       run: ./gradlew build
+
     - name: Set current date as env variable
       run: echo "NOW=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_ENV
+
     - name: Upload jars artifact
       uses: actions/upload-artifact@v4
       with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..b959b521
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,40 @@
+name: Publish
+on: [workflow_dispatch]
+
+permissions:
+  contents: read
+
+env:
+  VERSION: 2.0.0
+  RELEASE_NAME: mpkmod-${{ env.VERSION }}
+  MODRINTH_TOKEN: ${{ secrets.PUBLISH_MODRINTH_TOKEN }}
+  GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Environment Variables
+        run: env
+
+      - name: Build
+        uses: ./.github/workflows/build.yml
+
+      - name: Publish (CurseForge/Modrinth/GitHub)
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          modrinth-id: 412tAvWq
+          modrinth-token: "${{env.MODRINTH_TOKEN}}"
+
+          github-tag: "v${{env.VERSION}}"
+          github-token: "${{env.GITHUB_TOKEN}}"
+
+          name: "${{env.RELEASE_NAME}}"
+          version: "${{env.VERSION}}"
+          version-type: release
+          github-generate-changelog: true
+
+          loaders: forge,fabric
+          game-versions: "1.8.9,1.19.4,1.20.4,1.20.6,1.21,1.21.3,1.21.5,1.21.6,1.21.8" #TODO: Clean this up
+          game-version-filter: "releases"
+          java: "1.8,17"
\ No newline at end of file