diff --git a/spec/results/base-allparams.yml b/spec/results/base-allparams.yml
index 6dbaafa..beca811 100644
--- a/spec/results/base-allparams.yml
+++ b/spec/results/base-allparams.yml
@@ -111,7 +111,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -228,13 +228,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 stemcells:
 - alias: default
   os: test-stemcell
diff --git a/spec/results/broker.yml b/spec/results/broker.yml
index b10fc7d..3c5b390 100644
--- a/spec/results/broker.yml
+++ b/spec/results/broker.yml
@@ -111,7 +111,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -228,13 +228,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 stemcells:
 - alias: default
   os: ubuntu-jammy
diff --git a/spec/results/external-rmq-lb.yml b/spec/results/external-rmq-lb.yml
index 42b7f38..dc75301 100644
--- a/spec/results/external-rmq-lb.yml
+++ b/spec/results/external-rmq-lb.yml
@@ -94,7 +94,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -211,13 +211,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 stemcells:
 - alias: default
   os: ubuntu-jammy
diff --git a/spec/results/metrics-emitter.yml b/spec/results/metrics-emitter.yml
index 46d546e..0b22fc0 100644
--- a/spec/results/metrics-emitter.yml
+++ b/spec/results/metrics-emitter.yml
@@ -111,7 +111,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -264,13 +264,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 - name: rabbitmq-metrics-emitter
   sha1: 05afc6f3559f45e0696c6a3760242045640e0df8
   url: https://github.com/starkandwayne/rabbitmq-metrics-emitter-release/releases/download/v0.4.1/rabbitmq-metrics-emitter-0.4.1.tgz
diff --git a/spec/results/nats-tls.yml b/spec/results/nats-tls.yml
index c585eeb..576b578 100644
--- a/spec/results/nats-tls.yml
+++ b/spec/results/nats-tls.yml
@@ -157,7 +157,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -295,13 +295,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 - name: routing
   sha1: 699938162493f1fc8f9e7519d851451bdd0df0fb
   url: https://bosh.io/d/github.com/cloudfoundry/routing-release?v=0.296.0
diff --git a/spec/results/no-tls.yml b/spec/results/no-tls.yml
index 08daa7f..40ba955 100644
--- a/spec/results/no-tls.yml
+++ b/spec/results/no-tls.yml
@@ -94,7 +94,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -162,13 +162,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 stemcells:
 - alias: default
   os: ubuntu-jammy
diff --git a/spec/results/route-registrar.yml b/spec/results/route-registrar.yml
index e7ad711..a9fb940 100644
--- a/spec/results/route-registrar.yml
+++ b/spec/results/route-registrar.yml
@@ -152,7 +152,7 @@ instance_groups:
     release: cf-rabbitmq-multitenant-broker
   - name: bpm
     release: bpm
-  - name: cf-cli-6-linux
+  - name: cf-cli-7-linux
     release: cf-cli
   - name: broker-registrar
     properties:
@@ -285,13 +285,13 @@ releases:
   url: https://s3.amazonaws.com/cf-rabbitmq-multitenant-broker-genesis-releases/cf-rabbitmq-multitenant-broker-107.0.0.tgz
   version: 107.0.0
 - name: cf-rabbitmq-smoke-tests
-  sha1: 4431e40e869113afcfc7d92aa37e84d8415eee11
-  url: https://s3.amazonaws.com/cf-rabbitmq-smoke-tests-genesis-releases/cf-rabbitmq-smoke-tests-120.0.0.tgz
-  version: 120.0.0
+  sha1: 1a0ff77c30f1b39b6121bb10008d0979db8bb08c
+  url: https://bosh.io/d/github.com/pivotal-cf/cf-rabbitmq-smoke-tests-release?v=166.0.0
+  version: 166.0.0
 - name: cf-cli
-  sha1: 579466410a0a9c37d8e1994941e15529db8c54cd
-  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.36.0
-  version: 1.36.0
+  sha1: c0aeacde21976b8710b7010976acf3c056d7a81d
+  url: https://bosh.io/d/github.com/bosh-packages/cf-cli-release?v=1.60.0
+  version: 1.60.0
 - name: routing
   sha1: 699938162493f1fc8f9e7519d851451bdd0df0fb
   url: https://bosh.io/d/github.com/cloudfoundry/routing-release?v=0.296.0