diff --git a/cf-acceptance-tests/Dockerfile b/cf-acceptance-tests/Dockerfile
index eae67541..1a7b082c 100644
--- a/cf-acceptance-tests/Dockerfile
+++ b/cf-acceptance-tests/Dockerfile
@@ -17,7 +17,7 @@ ENV GOPATH /go
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 
 ENV GO_VERSION "1.19"
-ENV CF_CLI_VERSION "7.4.0"
+ENV CF_CLI_VERSION "8.5.0"
 ENV CF_LOG_CACHE_VERSION "2.1.0"
 
 RUN \
diff --git a/cf-acceptance-tests/cf-acceptance-tests_spec.rb b/cf-acceptance-tests/cf-acceptance-tests_spec.rb
index 5ce41a75..d148cf4a 100644
--- a/cf-acceptance-tests/cf-acceptance-tests_spec.rb
+++ b/cf-acceptance-tests/cf-acceptance-tests_spec.rb
@@ -3,7 +3,7 @@
 require 'serverspec'
 
 GO_VERSION="1.17"
-CF_CLI_VERSION="7.4.0"
+CF_CLI_VERSION="8.5.0"
 LOG_CACHE_CLI_VERSION="2.1.0"
 
 describe "cf-acceptance-tests image" do
diff --git a/cf-cli/Dockerfile b/cf-cli/Dockerfile
index 8d8c3ee3..24dacd8f 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 "7.2.0"
+ENV CF_CLI_VERSION "8.5.0"
 ENV SPRUCE_VERSION "1.27.0"
 
 RUN apk add --no-cache $PACKAGES
diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb
index d51d37fa..b95aa272 100644
--- a/cf-cli/cf-cli_spec.rb
+++ b/cf-cli/cf-cli_spec.rb
@@ -2,7 +2,7 @@
 require 'docker'
 require 'serverspec'
 
-CF_CLI_VERSION="7.2.0"
+CF_CLI_VERSION="8.5.0"
 SPRUCE_BIN = "/usr/local/bin/spruce"
 SPRUCE_VERSION = "1.27.0"