diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml
index d4995f5a..6f31bc7f 100644
--- a/.github/workflows/build-image-base.yml
+++ b/.github/workflows/build-image-base.yml
@@ -105,8 +105,8 @@ jobs:
           files: "./${{ inputs.image }}/${{ inputs.image }}_spec.rb"
 
       - name: Build for acceptance test
-        if: steps.check_for_tests.outputs.files_exist == 'true'
-        uses: docker/build-push-action@v3.2.0
+        if: steps.check_for_tests.outputs.files_exists == 'true'
+        uses: docker/build-push-action@v4
         with:
           context: ./${{ inputs.image }}
           file: ./${{ inputs.image }}/${{inputs.dockerfile}}
@@ -115,21 +115,21 @@ jobs:
           labels: ${{ steps.meta-ghcr.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: ${{ inputs.platforms }}
+          platforms: "linux/amd64"
 
       - name: Set up ruby
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-        if: steps.check_for_tests.outputs.files_exist == 'true'
+        if: steps.check_for_tests.outputs.files_exists == 'true'
       - name: Acceptance Tests
         env:
           DOCKER_IMAGE: "${{ env.TEST_TAG }}"
         run: bundle exec rspec ./${{ inputs.image }}/${{ inputs.image }}_spec.rb
-        if: steps.check_for_tests.outputs.files_exist == 'true'
+        if: steps.check_for_tests.outputs.files_exists == 'true'
 
       - name: Build and push to ghcr
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4
         with:
           context: ./${{ inputs.image }}
           platforms: ${{ inputs.platforms }}
@@ -147,7 +147,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Build and push to docker hub
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: ./${{ inputs.image }}
           platforms: ${{ inputs.platforms }}
diff --git a/cf-cli/Dockerfile b/cf-cli/Dockerfile
index 6465a9a1..02ee20b1 100644
--- a/cf-cli/Dockerfile
+++ b/cf-cli/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/alphagov/paas/ruby-base:main
 
 ENV PACKAGES "unzip curl openssl ca-certificates git libc6-compat bash jq gettext make"
-ENV CF_CLI_VERSION "8.6.0"
+ENV CF_CLI_VERSION "8.7.1"
 ENV SPRUCE_VERSION "1.30.2"
 
 RUN apk add --no-cache $PACKAGES
diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb
index c6ec8c69..799f18b6 100644
--- a/cf-cli/cf-cli_spec.rb
+++ b/cf-cli/cf-cli_spec.rb
@@ -2,9 +2,9 @@
 require 'docker'
 require 'serverspec'
 
-CF_CLI_VERSION="8.6.0"
+CF_CLI_VERSION="8.7.1"
 SPRUCE_BIN = "/usr/local/bin/spruce"
-SPRUCE_VERSION = "1.27.0"
+SPRUCE_VERSION = "1.30.2"
 
 describe "cf-cli image" do
   before(:all) {
@@ -72,7 +72,7 @@
 
   it "has the spruce version #{SPRUCE_VERSION}" do
     spruce_version = command("spruce --version").stdout.strip
-    expect(spruce_version).to match(/spruce - Version #{SPRUCE_VERSION}( \(master\))?/)
+    expect(spruce_version).to match(/spruce - Version v#{SPRUCE_VERSION}/)
   end
 
   it "has `bash` available" do
diff --git a/spruce/spruce_spec.rb b/spruce/spruce_spec.rb
index 95c226be..dce725a0 100644
--- a/spruce/spruce_spec.rb
+++ b/spruce/spruce_spec.rb
@@ -3,7 +3,7 @@
 require 'serverspec'
 
 SPRUCE_BIN = "/usr/local/bin/spruce"
-SPRUCE_VERSION = "1.27.0"
+SPRUCE_VERSION = "1.30.2"
 ALPINE_VERSION = "3.16"
 
 describe "spruce image" do
@@ -28,7 +28,7 @@ def os_version
   end
 
   it "has the spruce version #{SPRUCE_VERSION}" do
-    expect(spruce_version).to match(/spruce - Version #{SPRUCE_VERSION}( \(master\))?/)
+    expect(spruce_version).to match(/spruce - Version v#{SPRUCE_VERSION}/)
   end
 
   def spruce_version