diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 77a8cf806..346498a91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,17 +91,19 @@ jobs:
 
             - name: dev - Docker build and push
               if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
-              uses: docker/build-push-action@v6
+              uses: Wandalen/wretry.action@master
               with:
-                  context: .
-                  file: docker/Dockerfile
-                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
-                  tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
-                  push: true
-                  build-args: |
-                      COMMIT=${{ github.sha }}
-                      VERSION=dev
-                      DATE=${{ github.event.repository.updated_at }}
+                  action: docker/build-push-action@v6
+                  with: |
+                      context: .
+                      file: docker/Dockerfile
+                      platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
+                      tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
+                      push: true
+                      build-args: |
+                          COMMIT=${{ github.sha }}
+                          VERSION=dev
+                          DATE=${{ github.event.repository.updated_at }}
 
             - name: dev - Publish types
               if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
@@ -139,17 +141,19 @@ jobs:
 
             - name: release - Docker build and push
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
-              uses: docker/build-push-action@v6
+              uses: Wandalen/wretry.action@master
               with:
-                  context: .
-                  file: docker/Dockerfile
-                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
-                  tags: ${{ steps.meta.outputs.tags }}
-                  push: true
-                  build-args: |
-                      COMMIT=${{ github.sha }}
-                      VERSION=${{ github.ref_name }}
-                      DATE=${{ github.event.repository.updated_at }}
+                  action: docker/build-push-action@v6
+                  with: |
+                      context: .
+                      file: docker/Dockerfile
+                      platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
+                      tags: ${{ steps.meta.outputs.tags }}
+                      push: true
+                      build-args: |
+                          COMMIT=${{ github.sha }}
+                          VERSION=${{ github.ref_name }}
+                          DATE=${{ github.event.repository.updated_at }}
 
             - name: 'release: Publish to npm'
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'