diff --git a/cli/config/compose/profiles/fleet/default/kibana.config.yml b/cli/config/compose/profiles/fleet/default/kibana.config.yml
index 3d97786aa4..642db8b2fd 100644
--- a/cli/config/compose/profiles/fleet/default/kibana.config.yml
+++ b/cli/config/compose/profiles/fleet/default/kibana.config.yml
@@ -10,11 +10,10 @@ elasticsearch.password: changeme
 xpack.monitoring.ui.container.elasticsearch.enabled: true
 
 xpack.fleet.enabled: true
-xpack.fleet.registryUrl: https://epr-staging.elastic.co
+xpack.fleet.registryUrl: "http://package-registry:8080"
 xpack.fleet.agents.enabled: true
-xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
-xpack.fleet.agents.fleet_server.hosts:
-  ["http://fleet-server:8220"]
+xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200"
+xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"]
 
 xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012"
 xpack.fleet.agents.tlsCheckDisabled: true
diff --git a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml
index 5f2c3f539f..5fd284b873 100644
--- a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml
+++ b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml
@@ -4,15 +4,15 @@ server.host: "0.0.0.0"
 
 telemetry.enabled: false
 
-elasticsearch.hosts: ["http://elasticsearch:9200"]
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
 elasticsearch.username: elastic
 elasticsearch.password: changeme
 xpack.monitoring.ui.container.elasticsearch.enabled: true
 
 xpack.fleet.enabled: true
-xpack.fleet.registryUrl: https://epr-staging.elastic.co
+xpack.fleet.registryUrl: "http://package-registry:8080"
 xpack.fleet.agents.enabled: true
-xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
+xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200"
 xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"]
 
 xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012"
diff --git a/internal/deploy/elastic_package.go b/internal/deploy/elastic_package.go
index 57f559f47f..bdebe2bf95 100644
--- a/internal/deploy/elastic_package.go
+++ b/internal/deploy/elastic_package.go
@@ -76,7 +76,8 @@ func (ep *EPServiceManager) Add(ctx context.Context, profile ServiceRequest, ser
 
 func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error {
 	// check compose profile
-	kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.yml")
+	// The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml
+	kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.default.yml")
 	found, err := io.Exists(kibanaProfileFile)
 	if !found || err != nil {
 		return err