diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index ab6f25d86..d59655c46 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -3,8 +3,6 @@ name: Changelog
 on:
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
   workflow_dispatch:
 
 permissions:
@@ -14,6 +12,8 @@ jobs:
   changelog:
     name: Generate changelog
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -22,7 +22,6 @@ jobs:
 
       - name: Generate changelog
         uses: orhun/git-cliff-action@v4
-        id: git-cliff
         with:
           config: cliff.toml
           args: --verbose
@@ -30,11 +29,10 @@ jobs:
           OUTPUT: CHANGELOG.md
           GITHUB_REPO: ${{ github.repository }}
 
-      - name: Commit changes
+      - name: Commit
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
-          git checkout -b git-cliff
           git add CHANGELOG.md
           git commit -m "docs: update changelog"
-          git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git git-cliff 
+          git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git main
diff --git a/.github/workflows/coolify-production-build.yml b/.github/workflows/coolify-production-build.yml
index d7244fc84..ad0878205 100644
--- a/.github/workflows/coolify-production-build.yml
+++ b/.github/workflows/coolify-production-build.yml
@@ -12,6 +12,7 @@ on:
       - docker/coolify-realtime/Dockerfile
       - docker/testing-host/Dockerfile
       - templates/**
+      - CHANGELOG.md
 
 env:
   GITHUB_REGISTRY: ghcr.io
diff --git a/.github/workflows/coolify-staging-build.yml b/.github/workflows/coolify-staging-build.yml
index bcb65ecbf..ff6b553df 100644
--- a/.github/workflows/coolify-staging-build.yml
+++ b/.github/workflows/coolify-staging-build.yml
@@ -12,6 +12,7 @@ on:
         - docker/coolify-realtime/Dockerfile
         - docker/testing-host/Dockerfile
         - templates/**
+        - CHANGELOG.md
 
 env:
   GITHUB_REGISTRY: ghcr.io
diff --git a/.gitignore b/.gitignore
index d7ee7e96c..541c8e920 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ scripts/load-test/*
 .env.dusk.local
 docker/coolify-realtime/node_modules
 .DS_Store
+Changelog.md