diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 95b723445ee3..f888d580077d 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -4633,6 +4633,16 @@ Cloud Foundry module
 
 
 
+*`cloudfoundry.type`*::
++
+--
+The type of event from Cloud Foundry. Possible values include 'container', 'counter' and 'value'.
+
+
+type: keyword
+
+--
+
 [float]
 === app
 
diff --git a/x-pack/libbeat/common/cloudfoundry/events.go b/x-pack/libbeat/common/cloudfoundry/events.go
index ae038aadead3..c588491f6f7e 100644
--- a/x-pack/libbeat/common/cloudfoundry/events.go
+++ b/x-pack/libbeat/common/cloudfoundry/events.go
@@ -492,9 +492,9 @@ func envelopMap(evt Event) common.MapStr {
 func baseMap(evt Event) common.MapStr {
 	return common.MapStr{
 		"cloudfoundry": common.MapStr{
+			"type": evt.String(),
 			evt.String(): common.MapStr{
 				"timestamp": evt.Timestamp(),
-				"type":      evt.String(),
 			},
 			"envelope": envelopMap(evt),
 		},
diff --git a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
index 0190cac342e9..83cc074363e5 100644
--- a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
@@ -8,6 +8,11 @@
       type: group
       description: >
       fields:
+        - name: type
+          type: keyword
+          description: >
+            The type of event from Cloud Foundry.
+            Possible values include 'container', 'counter' and 'value'.
         - name: app
           type: group
           description: >
diff --git a/x-pack/metricbeat/module/cloudfoundry/fields.go b/x-pack/metricbeat/module/cloudfoundry/fields.go
index 1d3e678ea942..7372653df2b5 100644
--- a/x-pack/metricbeat/module/cloudfoundry/fields.go
+++ b/x-pack/metricbeat/module/cloudfoundry/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetCloudfoundry returns asset data.
 // This is the base64 encoded gzipped contents of module/cloudfoundry.
 func AssetCloudfoundry() string {
-	return "eJzclbFy2zAQRHt+xY178wNYpIgzmXGXwqljCFhKGIEAAxwk8+8zoESbpCDFCWUVVqHiAL5d7uGIe9qiq0gaF1XtolW+K4hYs0FFd+PyXUGkEKTXLWtnK/pSEBE9pC30/bCHGqeiQUHkYSACKsJLC68bWBamIKo1jApV/+g9WdHgRDz9uGtR0dq72B4rGekpbUwUbftay8HOAg+/pw0Swmgp0jLxBtSAvZakA4kQnNSCoWiveVOOHp37GXvSalIebG3R7Z2fr10wNxh8/Eau7q2NrJYnUUhnWWgLvySQ51fK8wAMb+RjNoFq75rpgRiHc+5IvCs8G1hYiV/aKrxkgzTOrv8pxceEGjIcBMa9XiExA7Ers6ZkG8tWctZNbZyYr/ylqQ8/flIMYg1q4WVKZ428cIPG+a5cdYxwnSzoa2KlMGKAGgQuif+OjsXHWBA7oY1YGVz0oXTYfmAEgZ0/24Be+yYJnNh4m+toefFU94zJTPeVG0x0+r/uBzERh3E+vseZ7sGwuFLLkrDSdQ2P9PVYgffA4cYwIjCxbjB2RNjBMjkpo/dQeYPspjkuNdjzaCdMBNXO5xMaxPtti45VT/iEh6p/r3zHotX5e+C/hRPxHcLzbtGSG+hp0JoJ/wkAAP//aoqyCQ=="
+	return "eJzclUFz2jAQhe/8ip1cuDT8AB96aDqdyS2H9NwI6Rk0yJIqrSD+9x0JTGwwgRaSQ31ghrX03tO3lnRPK7QVSeOSql2yKrQTItZsUNFdv3w3IVKIMmjP2tmKvk6IiB7yEPqxHUONU8lgQhRgICIqwqtH0A0sCzMhqjWMilWZek9WNDgyzw+3HhUtgkt+VxmxHqr1FfP0fbFTW6HduKB69VHN7fO8RJlGriasYZnq4JrhameDGU8uRj03oLUwCZG0lSYp0FQ6y0JbhOmX/CdZRpiSsIqmZeh0dpRfeH8Uvw/jgvDCe6OlyK+Jl6AGHLQkHUnE6KQWDEUbzcv+Kg559jNpNSifpnomXBfw8Xtmy8Ooxyj29K4B8rJXeekE45vyjk080+JTn/RF8GxkYSV+aavwOgrSOLv4K4qPWapj2Bn0ez1H1ozEbjYaSvo085JH09TGicM3Z5r68PSTUhQLkEeQmc4C48YNGhfa2bxlxNuwoG9ZK8NIEaozeM/8d3IsPiaCWAttRD4K3suhdFx9IILILpxsQPH+FAJHMd72dTkIr9zVRWOwp0vlE3Z0/r3tgZgVu+28W8eJ7sGwuFHLsrHSdY2AfHrMwRtge2MYEZlYN+gn2l2GTsoUAtR4QHZDjtcGLHrbe5VqF8YJdeZl2FWfVVH4Dz+qsq7xjiWrx++BfzbOihcYH3aLrrmBnjuvA+M/AQAA///wT+lI"
 }