diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
index ea522a8..00bbcb8 100644
--- a/.github/workflows/build_images.yaml
+++ b/.github/workflows/build_images.yaml
@@ -74,7 +74,7 @@ jobs:
           password: ${{ secrets.HARBOR_TOKEN }}
       - name: Build & push to staging
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -83,7 +83,7 @@ jobs:
           tags: "harbor.stfc.ac.uk/stfc-cloud-staging/${{ matrix.image }}:${{ needs.setup.outputs.sha }}"
       - name: Build & push to prod
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           push: true
           context: "{{defaultContext}}:${{ matrix.image }}"
diff --git a/.github/workflows/cloud_monitoring.yaml b/.github/workflows/cloud_monitoring.yaml
index c09d4aa..524fce4 100644
--- a/.github/workflows/cloud_monitoring.yaml
+++ b/.github/workflows/cloud_monitoring.yaml
@@ -77,7 +77,7 @@ jobs:
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Build and push to staging project
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -181,7 +181,7 @@ jobs:
           password: ${{ secrets.HARBOR_TOKEN }}
 
       - name: Build and push on version change
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         if: steps.release_updated.outputs.version == 'true'
         with:
           cache-from: type=gha
diff --git a/.github/workflows/rabbit_consumer.yaml b/.github/workflows/rabbit_consumer.yaml
index c14b465..bb62aa1 100644
--- a/.github/workflows/rabbit_consumer.yaml
+++ b/.github/workflows/rabbit_consumer.yaml
@@ -71,7 +71,7 @@ jobs:
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Build and push to staging project
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -112,7 +112,7 @@ jobs:
               - 'openstack-rabbit-consumer/version.txt'
 
       - name: Build and push on version change
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         if: steps.release_updated.outputs.version == 'true'
         with:
           cache-from: type=gha
diff --git a/.github/workflows/rabbit_consumer_chart_schedule.yaml b/.github/workflows/rabbit_consumer_chart_schedule.yaml
index c02e3a6..16da87f 100644
--- a/.github/workflows/rabbit_consumer_chart_schedule.yaml
+++ b/.github/workflows/rabbit_consumer_chart_schedule.yaml
@@ -65,7 +65,7 @@ jobs:
         run: echo "version=$(cat openstack-rabbit-consumer/version.txt)" >> $GITHUB_OUTPUT
 
       - name: Build and push on version change
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         if: steps.release_updated.outputs.version == 'true'
         with:
           cache-from: type=gha
diff --git a/.github/workflows/username_service.yaml b/.github/workflows/username_service.yaml
index 2e29c48..0a4a747 100644
--- a/.github/workflows/username_service.yaml
+++ b/.github/workflows/username_service.yaml
@@ -33,7 +33,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Run tests in container
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           no-cache: true
           cache-to: type=gha,mode=max
@@ -62,7 +62,7 @@ jobs:
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Build and push to staging project
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -103,7 +103,7 @@ jobs:
               - 'stfc-username-service/version.txt'
 
       - name: Build and push on version change
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         if: steps.release_updated.outputs.version == 'true'
         with:
           cache-from: type=gha