diff --git a/e2e/Makefile b/e2e/Makefile
index 8b1762cc01..380e5b685a 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -83,6 +83,7 @@ functional-test: install-godog
 	ELASTIC_APM_ENVIRONMENT="${ELASTIC_APM_ENVIRONMENT}" \
 	ELASTIC_APM_SECRET_TOKEN="${APM_SECRET_TOKEN}" \
 	ELASTIC_APM_SERVER_URL="${APM_SERVER_URL}" \
+	KIBANA_VERSION=pr97021 \
 	godog --format=${FORMAT} ${TAGS_FLAG} ${TAGS_VALUE}
 
 .PHONY: lint
diff --git a/e2e/_suites/fleet/configurations/kibana.config.yml b/e2e/_suites/fleet/configurations/kibana.config.yml
index e4f017652a..8c466c6da6 100644
--- a/e2e/_suites/fleet/configurations/kibana.config.yml
+++ b/e2e/_suites/fleet/configurations/kibana.config.yml
@@ -15,6 +15,6 @@ xpack.fleet.enabled: true
 xpack.fleet.registryUrl: http://package-registry:8080
 xpack.fleet.agents.enabled: true
 xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
-xpack.fleet.agents.fleetServerEnabled: true
-xpack.fleet.agents.kibana.host: http://kibana:5601
+xpack.fleet.agents.fleet_server.hosts:
+  - http://kibana:5601
 xpack.fleet.agents.tlsCheckDisabled: true