diff --git a/cli/config/compose/profiles/fleet/configurations/kibana.config.yml b/cli/config/compose/profiles/fleet/configurations/kibana.config.yml
index e9a660a62d..14af5e4868 100644
--- a/cli/config/compose/profiles/fleet/configurations/kibana.config.yml
+++ b/cli/config/compose/profiles/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
diff --git a/e2e/_suites/fleet/fleet.go b/e2e/_suites/fleet/fleet.go
index eb9565f972..89ff6d3569 100644
--- a/e2e/_suites/fleet/fleet.go
+++ b/e2e/_suites/fleet/fleet.go
@@ -419,12 +419,7 @@ func (fts *FleetTestSuite) processStateChangedOnTheHost(process string, state st
 func (fts *FleetTestSuite) setup() error {
 	log.Trace("Creating Fleet setup")
 
-	err := createFleetConfiguration()
-	if err != nil {
-		return err
-	}
-
-	err = checkFleetConfiguration()
+	err := checkFleetConfiguration()
 	if err != nil {
 		return err
 	}