diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml
index bb4a8a9d1..674277799 100644
--- a/.github/workflows/build_and_publish.yaml
+++ b/.github/workflows/build_and_publish.yaml
@@ -51,15 +51,6 @@ jobs:
         env:
           MOD_VERSION: ${{ steps.get_version.outputs.result }}
           MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }}
-      - name: Publish
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-          MOD_VERSION: ${{ steps.get_version.outputs.result }}
-          MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }}
       - name: Update CHANGELOG
         id: changelog
         uses: klikli-dev/changelog-action@main
@@ -88,6 +79,7 @@ jobs:
           file_pattern: CHANGELOG.md
       - name: Upload Forge Version to Mod Platforms
         uses: Kir-Antipov/mc-publish@v3.3
+        if: ${{ steps.get_release_type.outputs.result != 'test' }}
         with:
           modrinth-id: 692GClaE
           modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
@@ -113,6 +105,7 @@ jobs:
             jei(optional)
       - name: Upload Fabric Version to Mod Platforms
         uses: Kir-Antipov/mc-publish@v3.3
+        if: ${{ steps.get_release_type.outputs.result != 'test' }}
         with:
           modrinth-id: 692GClaE
           modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
@@ -135,4 +128,16 @@ jobs:
             Find changes for all versions at https://github.com/klikli-dev/modonomicon/releases
           dependencies: |
             fabric(required)
-            jei(optional)
\ No newline at end of file
+            jei(optional)
+# Publish at the end because it creates a non reobfed jarjar which otherwise would be distributed
+      - name: Publish
+        uses: gradle/gradle-build-action@v2
+        if: ${{ steps.get_release_type.outputs.result != 'test' }}
+        with:
+          arguments: publish
+          gradle-home-cache-cleanup: true
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          MOD_VERSION: ${{ steps.get_version.outputs.result }}
+          MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }}
\ No newline at end of file