diff --git a/.github/workflows/build_addon.yml b/.github/workflows/build_addon.yml
index b403efd..bb43788 100644
--- a/.github/workflows/build_addon.yml
+++ b/.github/workflows/build_addon.yml
@@ -120,7 +120,7 @@ jobs:
           images: |
             ${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}                  
           tags: |
-            type=ref,event=branch
+            type=ref,event=branch,suffix=.${{ github.run_number }}
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}} 
diff --git a/.github/workflows/update_repository.yml b/.github/workflows/update_repository.yml
index 422c9ee..72c3e12 100644
--- a/.github/workflows/update_repository.yml
+++ b/.github/workflows/update_repository.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           valueFile: 'repository/nextcloud_backup/config.yml'
           propertyPath: 'version'
-          value: ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_id}}
+          value: ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_number}}
           commitChange: false
       
       - name: Create pull request
@@ -54,7 +54,7 @@ jobs:
         with:
           token: ${{ secrets.PAT_PR }}
           path: "repository"
-          commit-message: "Update Nextcloud Backup to ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_id}}"
-          branch: "update/Nextcloud Backup/${{ steps.branch-names.outputs.current_branch }}.${{ github.run_id}}"
+          commit-message: "Update Nextcloud Backup to ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_number }}"
+          branch: "update/bextcloud_backup/${{ steps.branch-names.outputs.current_branch }}.${{ github.run_number }}"
           base: "${{ steps.branch-names.outputs.current_branch }}"
-          title: "Update Nextcloud Backup to ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_id}}"
+          title: "Update Nextcloud Backup to ${{ steps.branch-names.outputs.current_branch }}.${{ github.run_number }}"