diff --git a/metricbeat/docs/modules/cloudfoundry.asciidoc b/metricbeat/docs/modules/cloudfoundry.asciidoc
index ce079c0f452..b59999d2a54 100644
--- a/metricbeat/docs/modules/cloudfoundry.asciidoc
+++ b/metricbeat/docs/modules/cloudfoundry.asciidoc
@@ -6,7 +6,7 @@ This file is generated! See scripts/mage/docs_collector.go
 [role="xpack"]
 == cloudfoundry module
 
-experimental[]
+beta[]
 
 This is the cloudfoundry module.
 
diff --git a/metricbeat/docs/modules/cloudfoundry/container.asciidoc b/metricbeat/docs/modules/cloudfoundry/container.asciidoc
index 99e55464986..1dafc6ec9d0 100644
--- a/metricbeat/docs/modules/cloudfoundry/container.asciidoc
+++ b/metricbeat/docs/modules/cloudfoundry/container.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-cloudfoundry-container]]
 === cloudfoundry container metricset
 
-experimental[]
+beta[]
 
 include::../../../../x-pack/metricbeat/module/cloudfoundry/container/_meta/docs.asciidoc[]
 
diff --git a/metricbeat/docs/modules/cloudfoundry/counter.asciidoc b/metricbeat/docs/modules/cloudfoundry/counter.asciidoc
index 254fbb4c950..07aeedaf22c 100644
--- a/metricbeat/docs/modules/cloudfoundry/counter.asciidoc
+++ b/metricbeat/docs/modules/cloudfoundry/counter.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-cloudfoundry-counter]]
 === cloudfoundry counter metricset
 
-experimental[]
+beta[]
 
 include::../../../../x-pack/metricbeat/module/cloudfoundry/counter/_meta/docs.asciidoc[]
 
diff --git a/metricbeat/docs/modules/cloudfoundry/value.asciidoc b/metricbeat/docs/modules/cloudfoundry/value.asciidoc
index 4c25ef3df34..49832b62a2c 100644
--- a/metricbeat/docs/modules/cloudfoundry/value.asciidoc
+++ b/metricbeat/docs/modules/cloudfoundry/value.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-cloudfoundry-value]]
 === cloudfoundry value metricset
 
-experimental[]
+beta[]
 
 include::../../../../x-pack/metricbeat/module/cloudfoundry/value/_meta/docs.asciidoc[]
 
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
index 4d45df596a1..c2964b33680 100644
--- a/metricbeat/docs/modules_list.asciidoc
+++ b/metricbeat/docs/modules_list.asciidoc
@@ -58,10 +58,10 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-ceph-osd_df,osd_df>>   
 |<<metricbeat-metricset-ceph-osd_tree,osd_tree>>   
 |<<metricbeat-metricset-ceph-pool_disk,pool_disk>>   
-|<<metricbeat-module-cloudfoundry,cloudfoundry>>  experimental[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.3+| .3+|  |<<metricbeat-metricset-cloudfoundry-container,container>> experimental[]  
-|<<metricbeat-metricset-cloudfoundry-counter,counter>> experimental[]  
-|<<metricbeat-metricset-cloudfoundry-value,value>> experimental[]  
+|<<metricbeat-module-cloudfoundry,cloudfoundry>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.3+| .3+|  |<<metricbeat-metricset-cloudfoundry-container,container>> beta[]  
+|<<metricbeat-metricset-cloudfoundry-counter,counter>> beta[]  
+|<<metricbeat-metricset-cloudfoundry-value,value>> beta[]  
 |<<metricbeat-module-cockroachdb,CockroachDB>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-cockroachdb-status,status>> beta[]  
 |<<metricbeat-module-consul,consul>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
diff --git a/x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc b/x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc
index 6261f5b2d6a..c4428adb44c 100644
--- a/x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc
+++ b/x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc
@@ -9,7 +9,7 @@
 <titleabbrev>Cloud Foundry</titleabbrev>
 ++++
 
-experimental[]
+beta[]
 
 Use the `cloudfoundry` input to get http access logs, container logs and error logs from Cloud Foundry. Connects to
 the Cloud Foundry loggregator to receive events.
diff --git a/x-pack/libbeat/processors/add_cloudfoundry_metadata/docs/add_cloudfoundry_metadata.asciidoc b/x-pack/libbeat/processors/add_cloudfoundry_metadata/docs/add_cloudfoundry_metadata.asciidoc
index 5d529333ae0..8de150048fd 100644
--- a/x-pack/libbeat/processors/add_cloudfoundry_metadata/docs/add_cloudfoundry_metadata.asciidoc
+++ b/x-pack/libbeat/processors/add_cloudfoundry_metadata/docs/add_cloudfoundry_metadata.asciidoc
@@ -6,7 +6,7 @@
 <titleabbrev>add_cloudfoundry_metadata</titleabbrev>
 ++++
 
-experimental[]
+beta[]
 
 The `add_cloudfoundry_metadata` processor annotates each event with relevant metadata
 from Cloud Foundry applications. The events are annotated with Cloud Foundry metadata,
diff --git a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
index 83cc074363e..6ebccd8f17a 100644
--- a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "cloudfoundry"
   description: >
     Cloud Foundry module
-  release: experimental
+  release: beta
   fields:
     - name: cloudfoundry
       type: group
diff --git a/x-pack/metricbeat/module/cloudfoundry/container/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/container/_meta/fields.yml
index 7711469f160..1cd1228ab25 100644
--- a/x-pack/metricbeat/module/cloudfoundry/container/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/container/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     `container` contains container metrics from Cloud Foundry.
-  release: experimental
+  release: beta
   fields:
     - name: instance_index
       type: long
diff --git a/x-pack/metricbeat/module/cloudfoundry/counter/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/counter/_meta/fields.yml
index 1a6b5566d41..a3540c07ae0 100644
--- a/x-pack/metricbeat/module/cloudfoundry/counter/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/counter/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     `counter` contains counter metrics from Cloud Foundry.
-  release: experimental
+  release: beta
   fields:
     - name: name
       type: keyword
diff --git a/x-pack/metricbeat/module/cloudfoundry/fields.go b/x-pack/metricbeat/module/cloudfoundry/fields.go
index 7372653df2b..9ff2f798942 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 "eJzclUFz2jAQhe/8ip1cuDT8AB96aDqdyS2H9NwI6Rk0yJIqrSD+9x0JTGwwgRaSQ31ghrX03tO3lnRPK7QVSeOSql2yKrQTItZsUNFdv3w3IVKIMmjP2tmKvk6IiB7yEPqxHUONU8lgQhRgICIqwqtH0A0sCzMhqjWMilWZek9WNDgyzw+3HhUtgkt+VxmxHqr1FfP0fbFTW6HduKB69VHN7fO8RJlGriasYZnq4JrhameDGU8uRj03oLUwCZG0lSYp0FQ6y0JbhOmX/CdZRpiSsIqmZeh0dpRfeH8Uvw/jgvDCe6OlyK+Jl6AGHLQkHUnE6KQWDEUbzcv+Kg559jNpNSifpnomXBfw8Xtmy8Ooxyj29K4B8rJXeekE45vyjk080+JTn/RF8GxkYSV+aavwOgrSOLv4K4qPWapj2Bn0ez1H1ozEbjYaSvo085JH09TGicM3Z5r68PSTUhQLkEeQmc4C48YNGhfa2bxlxNuwoG9ZK8NIEaozeM/8d3IsPiaCWAttRD4K3suhdFx9IILILpxsQPH+FAJHMd72dTkIr9zVRWOwp0vlE3Z0/r3tgZgVu+28W8eJ7sGwuFHLsrHSdY2AfHrMwRtge2MYEZlYN+gn2l2GTsoUAtR4QHZDjtcGLHrbe5VqF8YJdeZl2FWfVVH4Dz+qsq7xjiWrx++BfzbOihcYH3aLrrmBnjuvA+M/AQAA///wT+lI"
+	return "eJzcVbGS2jAQ7fmKN9fQ5PgAFylymcxcd8Wlzi3SGjTIkiOtIP77jAzmbDAHCZAiLphhJb339Fa7+4gVNwWU9UmXPjkdmgkgRiwXeOiHHyaA5qiCqcV4V+DzBACe8hZ82+5B5XWyPAECW6bIBeYsNAFKw1bHoj3yCEcVH5HmT5qaCyyCT/UuMkI5ROsj5uP7YIe24mbjg+7FRzG33+uS22PwJXjNTlAGXw1vORucePExmrllrMkmjjBO2aQZU+WdkHEcpp/yn+SEwxTkNKbt1unsSD/V9ZH8vhkXiKe6tkZRXoYsGRVLMAomgmL0ypCwxsbIsn+LQz/7mowehE+7ekZcJ/D5a/ZWhlKPrdi7d40hb3uUtw4wviPvvIlnUnz4lC8yzUUhp/iHcZp/jRpovVv8kXvPGarzriPo53jOGTNC/GxUlKrTrFYyqqa0ng5XziTz6eU7UqQFo+ag2AkteJy44sqHZjZvhONtvMCXjJXNSJF1R/AR+c/khe4jgdZkLOUW8JEObeLqjhZE8eFkAlruf+LAkYz3em4b4JXV3GIMarmN3LGS8+9tG2BG7Mp4p/9E1tgOZOKKVGVibcqSA+euMWfZMG8nhKUoEFNxX9Fu+HmlUgisxwWKF7I3FNjibecoSh/GHerI221XPacW4T96TO19xjOVnBnv+39NnBEvID7MEq6ZOK8d1wHx7wAAAP//dsPbgA=="
 }
diff --git a/x-pack/metricbeat/module/cloudfoundry/value/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/value/_meta/fields.yml
index 0ba9f29890a..1e3e7a217e9 100644
--- a/x-pack/metricbeat/module/cloudfoundry/value/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/value/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     `value` contains counter metrics from Cloud Foundry.
-  release: experimental
+  release: beta
   fields:
     - name: name
       type: keyword