diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 1339d41d962..a8a61308c12 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -25466,6 +25466,7 @@ Stats scraped from a Prometheus endpoint.
 
 
 
+
 *`prometheus.labels.*`*::
 +
 --
@@ -25479,7 +25480,7 @@ type: object
 *`prometheus.metrics.*`*::
 +
 --
-Prometheus metric - release: ga
+Prometheus metric
 
 
 type: object
@@ -27756,6 +27757,7 @@ Statsd module
 
 
 
+
 *`statsd.*.count`*::
 +
 --
@@ -27769,7 +27771,7 @@ type: object
 *`statsd.*.*`*::
 +
 --
-Statsd metrics - release: beta
+Statsd metrics
 
 
 type: object
diff --git a/metricbeat/module/prometheus/_meta/fields.yml b/metricbeat/module/prometheus/_meta/fields.yml
index c6d1f9a1746..ceea6b49dd2 100644
--- a/metricbeat/module/prometheus/_meta/fields.yml
+++ b/metricbeat/module/prometheus/_meta/fields.yml
@@ -6,15 +6,18 @@
   release: ga
   settings: ["ssl", "http"]
   fields:
-    # Order is important here, labels will match first, the rest are double
-    - name: prometheus.labels.*
-      type: object
-      object_type: keyword
-      description: >
-        Prometheus metric labels
-    - name: prometheus.metrics.*
-      type: object
-      object_type: double
-      object_type_mapping_type: "*"
-      description: >
-        Prometheus metric
+    - name: prometheus
+      type: group
+      fields:
+        # Order is important here, labels will match first, the rest are double
+        - name: labels.*
+          type: object
+          object_type: keyword
+          description: >
+            Prometheus metric labels
+        - name: metrics.*
+          type: object
+          object_type: double
+          object_type_mapping_type: "*"
+          description: >
+            Prometheus metric
diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go
index 23d94ffe4c5..5123688cad5 100644
--- a/metricbeat/module/prometheus/fields.go
+++ b/metricbeat/module/prometheus/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetPrometheus returns asset data.
 // This is the base64 encoded gzipped contents of ../metricbeat/module/prometheus.
 func AssetPrometheus() string {
-	return "eJyUkc1qwzAQhO9+ikG9hSQPoENfoYUeSwmKtba30R+7G0LeviQ2aQIttLppv9FoNNrgQGePJjWTTXTUDjC2RB7u9TZ0HRBJe+FmXIvHcwcAbxZMob2ERhGD1IyA71OgElvlYtsO0KmK7fpaBh49hpCUOkAoUVDyGMNFQ2ZcRvV4d6rJreEms+Y+OmBgSlH99d4nvEgkASs4tyoWimEioTVS2FNSnDgl5GD9hIFFbQ2bCEJqCEKI9bhPdPXaoIRM9w1sZ4/t6soBOzfyqPtP6m0ZzZvdTA50PlWJC/qhpsu6ayWTCfdL0t8yzKK/h7h70QPZ5dAal3GRuZX7Z84b2Tx81lcAAAD//3hXtDU="
+	return "eJyckU1Ow0AMhfc5xdOwq9oeIAuuABJLhKppxklM50+2q6q3RyFtCYUNePmen/2NZ4MDnVtUKYlspKM2gLFFauGeb6JrgEDaCVfjkls8NgDwYt4U2omvFNBLSfD4SoFyqIWzbRtAxyK260rueWjR+6jUAEKRvFKLwU89ZMZ50BavTjW6NdxoVt1bA/RMMWj7uXeD7BPdUU9l5zrNknKsF2UZm+oBTxJIwApOtYj5bBhJaI3o9xQVJ44RyVs3omdRW8NGgpAavBBCOe4j3eZdUebwdnUzrjBl/06dLeRZ2M3ugc6nImFh/3Lmay0um8iEu8vWHzCz+3eau7d9c3fJ18p5uLS6lfsn9IJ2+fsfAQAA//+kwcDt"
 }
diff --git a/x-pack/metricbeat/module/statsd/_meta/fields.yml b/x-pack/metricbeat/module/statsd/_meta/fields.yml
index 7d26b197b23..a9fe3e8e931 100644
--- a/x-pack/metricbeat/module/statsd/_meta/fields.yml
+++ b/x-pack/metricbeat/module/statsd/_meta/fields.yml
@@ -4,15 +4,18 @@
     Statsd module
   release: beta
   fields:
-    - name: statsd.*.count
-      type: object
-      object_type: long
-      object_type_mapping_type: "long"
-      description: >
-        Statsd counters
-    - name: statsd.*.*
-      type: object
-      object_type: float
-      object_type_mapping_type: "*"
-      description: >
-        Statsd metrics
\ No newline at end of file
+    - name: statsd
+      type: group
+      fields:
+        - name: '*.count'
+          type: object
+          object_type: long
+          object_type_mapping_type: "long"
+          description: >
+            Statsd counters
+        - name: '*.*'
+          type: object
+          object_type: float
+          object_type_mapping_type: "*"
+          description: >
+            Statsd metrics
diff --git a/x-pack/metricbeat/module/statsd/fields.go b/x-pack/metricbeat/module/statsd/fields.go
index a15eac3cb38..4cc1e0c02a8 100644
--- a/x-pack/metricbeat/module/statsd/fields.go
+++ b/x-pack/metricbeat/module/statsd/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetStatsd returns asset data.
 // This is the base64 encoded gzipped contents of module/statsd.
 func AssetStatsd() string {
-	return "eJyMkD2OhSAURntW8YXSRBdAMZuYBRiEq2GGv8C1cPeTQX158VlY8p2T3BN6/NKmUFlztQJgx54U5HcbpAAsVVNcZpeiwpcAgB0iJLt6EkAhT7qSwkSsBTA78raq5vaIOtB5YegGk9bIDQG8ZVJI0w+Zc9of4058isvnPgads4vLIcl/Sx7aTe1bcbtNpd6XdQ+rZp/0Dbhmdc+aAnFxpr7m/vKdfwEAAP//q4R+AQ=="
+	return "eJyUkTtuxiAQhHtOMaL5JUvOAShyiRzAwrC2SHgJ1oVvH/kVkcgpvOV8s+Jb0eOLVoXKmqsVADv2pCA/9kAKwFI1xWV2KSq8CwA4IEKyiycBFPKkKymMxFoAkyNvq9q7PaIO1LywDa+ZFOaSlnwm7Uq79ureTFoiv37ItZ3GTzLcxEcwHNSnON+zIeicXZzPotyasqne3HvNefcuRKXeyXZPRSef9D/wr2n3TDMQF2day9//9B0AAP//sz6NDg=="
 }