diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f5effbb6221..8fa1e489051 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,12 +1,12 @@
 name: Build and Pre-release
 
 on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - labeled
-      - unlabeled
+#  pull_request:
+#    types:
+#      - opened
+#      - synchronize
+#      - labeled
+#      - unlabeled
   workflow_dispatch:
 
 permissions:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 913d9a0edae..71bdc691608 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,6 +1,12 @@
 name: Release
 
 on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+      - unlabeled
   push:
     branches:
       - "version/*"
@@ -13,8 +19,15 @@ permissions:
 
 jobs:
   release:
-    uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7
+    uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@fix/changelog-merging
     with:
       java: 21
       curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }}
-    secrets: inherit
+      gradle_tasks: assemble
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+      CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/build.gradle b/build.gradle
index e8165701a8f..a529664e605 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,4 +2,4 @@ plugins {
   id "org.sonarqube" version "3.0"
 }
 
-apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle'
\ No newline at end of file
+apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/fix/changelog-merging/gradle/mod.gradle'
\ No newline at end of file