diff --git a/.github/workflows/tiiuae-builder-images.yaml b/.github/workflows/tiiuae-builder-images.yaml
index 14f699106c87..d6037c86f3e0 100644
--- a/.github/workflows/tiiuae-builder-images.yaml
+++ b/.github/workflows/tiiuae-builder-images.yaml
@@ -33,7 +33,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build builder base image and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./px4-firmware/packaging/Dockerfile.build_env_pre
diff --git a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
index fd9582ec1744..9382d3afaa2e 100644
--- a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
+++ b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
@@ -251,7 +251,7 @@ jobs:
           check-jsonschema --schemafile px4-firmware/Tools/saluki_packaging/saluki_file_info-schema.json saluki_file_info.json
 
       - name: Firmware flasher - Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
@@ -403,7 +403,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Firmware flasher - Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
diff --git a/.github/workflows/tiiuae-sitl-gzsim.yaml b/.github/workflows/tiiuae-sitl-gzsim.yaml
index 9c1ed5e49c79..99c7c9f6d308 100644
--- a/.github/workflows/tiiuae-sitl-gzsim.yaml
+++ b/.github/workflows/tiiuae-sitl-gzsim.yaml
@@ -53,7 +53,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build tii-px4-sitl-gzsim image and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./px4-firmware/packaging/Dockerfile.sitl_gzsim
diff --git a/.github/workflows/tiiuae-sitl.yaml b/.github/workflows/tiiuae-sitl.yaml
index 3494378a4198..e0167b21632f 100644
--- a/.github/workflows/tiiuae-sitl.yaml
+++ b/.github/workflows/tiiuae-sitl.yaml
@@ -63,7 +63,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build tii-px4-sitl image and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./px4-firmware/packaging/Dockerfile.sitl