diff --git a/.github/scripts/gen-docker-tags.py b/.github/scripts/gen-docker-tags.py
index c45b991d90156a..f60e1cd41b35c3 100755
--- a/.github/scripts/gen-docker-tags.py
+++ b/.github/scripts/gen-docker-tags.py
@@ -31,4 +31,6 @@
             )
         ])
 
+        tags = tags + tuple([f'{r}:stable' for r in REPOS])
+
 print(','.join(tags))
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0324071f66e1b9..dfe6207c3e332e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -333,7 +333,7 @@ jobs:
       - name: Create and Push Manifest
         id: manifest
         if: github.repository == 'netdata/netdata'
-        run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}")"
+        run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}")
       - name: Failure Notification
         uses: rtCamp/action-slack-notify@v2
         env:
@@ -489,7 +489,7 @@ jobs:
       - name: Create and Push Manifest
         id: manifest
         if: github.repository == 'netdata/netdata'
-        run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}")"
+        run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}")
       - name: Failure Notification
         uses: rtCamp/action-slack-notify@v2
         env:
@@ -645,7 +645,7 @@ jobs:
       - name: Create and Push Manifest
         id: manifest
         if: github.repository == 'netdata/netdata'
-        run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}")"
+        run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}")
       - name: Failure Notification
         uses: rtCamp/action-slack-notify@v2
         env:
@@ -690,7 +690,7 @@ jobs:
           repo: netdata/helmchart
           workflow: Agent Version PR
           ref: refs/heads/master
-          inputs: '{"agent_version": "${{ inputs.version }}"}'
+          inputs: '{"agent_version": "v${{ inputs.version }}"}'
       - name: Trigger MSI build
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.version != 'nightly' && github.repository == 'netdata/netdata'
         id: trigger-msi