diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e44ea7e26..5e5c07016 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,30 +1,34 @@
-name: Build and Test PRs or General Branches
+name: Build and Pre-release
 
 on:
   pull_request:
     types:
-      - synchronize
       - opened
-      - ready_for_review
-      - reopened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
   push:
     branches:
-      - 'feature/**'
-      - 'bugfix/**'
-      - 'hotfix/**'
-      - 'fix/**'
-      - 'features/**'
+      - "version/*"
+      - "release/*"
+      - "testing/*"
   workflow_dispatch:
 
 permissions:
-  contents: write
+  contents: read
   statuses: write
+  packages: write
 
 jobs:
-  release:
-    uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7
+  build:
+    uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@main
+    with:
+      java: 17
+    secrets: inherit
+  pre-release:
+    uses: ldtteam/operapublicacreator/.github/workflows/gradle.prerelease.yaml@main
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release')
     with:
-      java: 21
-    secrets:
-      CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
\ No newline at end of file
+      java: 17
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e85e0f507..2f78ef09a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,11 +2,10 @@ name: Release
 
 on:
   push:
-    branches: [
-      "version/*",
-      "release/*",
-      "testing/*",
-    ]
+    branches:
+      - "version/*"
+      - "release/*"
+      - "testing/*"
 
 permissions:
   contents: write
@@ -14,14 +13,8 @@ permissions:
 
 jobs:
   release:
-    uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7
+    uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@main
     with:
-      java: 21
+      java: 17
       curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }}
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
-      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-      CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+    secrets: inherit