diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 98a30512188..67796404fe5 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -127,6 +127,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Windows .exe files now have embedded file version info. {issue}15232[15232]t
 - Remove experimental flag from `setup.template.append_fields` {pull}16576[16576]
 - Add `add_cloudfoundry_metadata` processor to annotate events with Cloud Foundry application data. {pull}16621[16621
+- Add `aws_ec2` provider for autodiscover. {issue}12518[12518] {pull}14823[14823]
 
 *Auditbeat*
 
@@ -194,6 +195,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add metricsets based on Ceph Manager Daemon to the `ceph` module. {issue}7723[7723] {pull}16254[16254]
 - Release `statsd` module as GA. {pull}16447[16447] {issue}14280[14280]
 - Add `redisenterprise` module. {pull}16482[16482] {issue}15269[15269]
+- Add kubernetes storage class support via kube-state-metrics. {pull}16145[16145]
 
 *Packetbeat*
 
diff --git a/NOTICE.txt b/NOTICE.txt
index e1e8ec9115c..2f03bb8b67e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1691,7 +1691,7 @@ Apache License 2.0
 
 --------------------------------------------------------------------
 Dependency: github.com/elastic/go-ucfg
-Version: v0.8.1
+Version: v0.8.2
 License type (autodetected): Apache-2.0
 ./vendor/github.com/elastic/go-ucfg/LICENSE:
 --------------------------------------------------------------------
diff --git a/go.mod b/go.mod
index 22fdc02dfee..288e93230aa 100644
--- a/go.mod
+++ b/go.mod
@@ -56,7 +56,7 @@ require (
 	github.com/elastic/go-structform v0.0.6
 	github.com/elastic/go-sysinfo v1.3.0
 	github.com/elastic/go-txfile v0.0.7
-	github.com/elastic/go-ucfg v0.8.1
+	github.com/elastic/go-ucfg v0.8.2
 	github.com/elastic/go-windows v1.0.1 // indirect
 	github.com/elastic/gosigar v0.10.5
 	github.com/fatih/color v1.5.0
diff --git a/go.sum b/go.sum
index 2309e6a135c..8b40f5c2615 100644
--- a/go.sum
+++ b/go.sum
@@ -210,8 +210,8 @@ github.com/elastic/go-txfile v0.0.7 h1:Yn28gclW7X0Qy09nSMSsx0uOAvAGMsp6XHydbiLVe
 github.com/elastic/go-txfile v0.0.7/go.mod h1:H0nCoFae0a4ga57apgxFsgmRjevNCsEaT6g56JoeKAE=
 github.com/elastic/go-ucfg v0.7.0 h1:1+C/sZdJKww8hKl7XtLPTjs4cFslhQF2fazKTF+ZE+4=
 github.com/elastic/go-ucfg v0.7.0/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
-github.com/elastic/go-ucfg v0.8.1 h1:qcu7ESw8PKSqVrccHhSmTmkZS3Wa2ip+6eJ3FXcbrUI=
-github.com/elastic/go-ucfg v0.8.1/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
+github.com/elastic/go-ucfg v0.8.2 h1:zVg4HdUfwQ0/SHKulInChTRLDh+tNZ1AAbj1fNWwPyQ=
+github.com/elastic/go-ucfg v0.8.2/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
 github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
 github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
diff --git a/vendor/github.com/elastic/go-ucfg/CHANGELOG.md b/vendor/github.com/elastic/go-ucfg/CHANGELOG.md
index f0326ac78ef..d3e0f617f9a 100644
--- a/vendor/github.com/elastic/go-ucfg/CHANGELOG.md
+++ b/vendor/github.com/elastic/go-ucfg/CHANGELOG.md
@@ -268,8 +268,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Introduced CHANGELOG.md for documenting changes to ucfg.
 
 
+<<<<<<< HEAD
 [Unreleased]: https://github.com/elastic/go-ucfg/compare/v0.8.3...HEAD
 [0.8.3]: https://github.com/elastic/go-ucfg/compare/v0.8.2...v0.8.3
+=======
+[Unreleased]: https://github.com/elastic/go-ucfg/compare/v0.8.2...HEAD
+>>>>>>> Update go-modules with master (#16274)
 [0.8.2]: https://github.com/elastic/go-ucfg/compare/v0.8.1...v0.8.2
 [0.8.1]: https://github.com/elastic/go-ucfg/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/elastic/go-ucfg/compare/v0.7.0...v0.8.0
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8ecfa1a8bd7..b98b14acbdb 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -437,7 +437,7 @@ github.com/elastic/go-txfile/internal/vfs/osfs/osfstest
 github.com/elastic/go-txfile/pq
 github.com/elastic/go-txfile/txerr
 github.com/elastic/go-txfile/txfiletest
-# github.com/elastic/go-ucfg v0.8.1
+# github.com/elastic/go-ucfg v0.8.2
 github.com/elastic/go-ucfg
 github.com/elastic/go-ucfg/cfgutil
 github.com/elastic/go-ucfg/flag