diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 7a941d9f9bd..b3f95341517 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -113,6 +113,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix CPU count in docker/cpu in cases where no `online_cpus` are reported {pull}15070[15070]
 - Add dedot for tags in ec2 metricset and cloudwatch metricset. {issue}15843[15843] {pull}15844[15844]
 - Use RFC3339 format for timestamps collected using the SQL module. {pull}15847[15847]
+- Change lookup_fields from metricset.host to service.address {pull}15883[15883]
+- Add dedot for cloudwatch metric name. {issue}15916[15916] {pull}15917[15917]
 
 *Packetbeat*
 
diff --git a/metricbeat/processor/add_kubernetes_metadata/indexers.go b/metricbeat/processor/add_kubernetes_metadata/indexers.go
index 416013eef5f..a86b4b8f211 100644
--- a/metricbeat/processor/add_kubernetes_metadata/indexers.go
+++ b/metricbeat/processor/add_kubernetes_metadata/indexers.go
@@ -30,7 +30,7 @@ func init() {
 	kubernetes.Indexing.AddDefaultIndexerConfig(kubernetes.IPPortIndexerName, *cfg)
 
 	config := map[string]interface{}{
-		"lookup_fields": []string{"metricset.host"},
+		"lookup_fields": []string{"service.address"},
 	}
 	fieldCfg, err := common.NewConfigFrom(config)
 	if err == nil {