diff --git a/.github/workflows/release_please.yml b/.github/workflows/release_please.yml
index eed69abcc..d59af0b15 100644
--- a/.github/workflows/release_please.yml
+++ b/.github/workflows/release_please.yml
@@ -27,6 +27,8 @@ jobs:
           package-name: release-please-action
           default-branch: dev
           token: ${{secrets.GH_TOKEN}}
+          include-v-in-tag: false
+          skip-github-release: true
 
       # Checkout repos
       - uses: actions/checkout@v3
@@ -50,7 +52,7 @@ jobs:
           MASTER_Z2M_VERSION=$(cat z2m-master/package.json | jq -r '.version')
           MASTER_ZHC_VERSION=$(cat z2m-master/package.json | jq -r '.dependencies."zigbee-herdsman-converters"')
           MASTER_ZH_VERSION=$(cat z2m-master/package.json | jq -r '.dependencies."zigbee-herdsman"')
-          wget -q -O - https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/release-please--branches--dev--components--release-please-action/CHANGELOG.md > z2m/CHANGELOG.md
+          wget -q -O - https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/release-please--branches--dev--components--release-please-action/CHANGELOG.md > z2m/CHANGELOG.md || true
           cd z2m
           npm ci
           node scripts/generateChangelog.js $MASTER_Z2M_VERSION $MASTER_ZHC_VERSION $MASTER_ZH_VERSION >> ../changelog.txt
@@ -82,11 +84,11 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: changelog
-        path: ../changelog.txt
+        path: ../changelog
     - uses: ncipollo/release-action@v1
       name: Create release
       with:
-        bodyFile: ../changelog.txt
+        bodyFile: ../changelog/changelog.txt
         draft: true
         name: ${{ needs.release-please.outputs.version }}
         tag: ${{ needs.release-please.outputs.version }}
@@ -99,8 +101,10 @@ jobs:
         github_token: ${{secrets.GH_TOKEN}}
     - name: Promote to dev
       run: |
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json
+        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json.tmp
+        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json.tmp
+        mv package.json.tmp package.json
+        mv package-lock.json.tmp package-lock.json
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
-        commit_message: Promote to dev
+        commit_message: "chore: promote to dev"