diff --git a/filebeat/docs/filebeat-options.asciidoc b/filebeat/docs/filebeat-options.asciidoc
index b6fa7edbe01f..8bbd06ec7f8a 100644
--- a/filebeat/docs/filebeat-options.asciidoc
+++ b/filebeat/docs/filebeat-options.asciidoc
@@ -84,6 +84,8 @@ You can configure {beatname_uc} to use the following inputs:
include::multiline.asciidoc[]
+include::../../x-pack/filebeat/docs/inputs/input-awscloudwatch.asciidoc[]
+
include::../../x-pack/filebeat/docs/inputs/input-azure-eventhub.asciidoc[]
include::../../x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc[]
diff --git a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
index 023ed4d9fb55..1024656f082b 100644
--- a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
+++ b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
@@ -5,7 +5,7 @@
:type: s3
[id="{beatname_lc}-input-{type}"]
-=== s3 input
+=== S3 input
++++
S3
diff --git a/x-pack/filebeat/docs/inputs/input-awscloudwatch.asciidoc b/x-pack/filebeat/docs/inputs/input-awscloudwatch.asciidoc
index 76f80963d5a6..415721b54f03 100644
--- a/x-pack/filebeat/docs/inputs/input-awscloudwatch.asciidoc
+++ b/x-pack/filebeat/docs/inputs/input-awscloudwatch.asciidoc
@@ -5,10 +5,10 @@
:type: awscloudwatch
[id="{beatname_lc}-input-{type}"]
-=== awscloudwatch input
+=== AWS CloudWatch input
++++
-awscloudwatch
+AWS CloudWatch
++++
beta[]
@@ -113,7 +113,4 @@ logs:FilterLogEvents
[id="{beatname_lc}-input-{type}-common-options"]
include::../../../../filebeat/docs/inputs/input-common-options.asciidoc[]
-[id="aws-credentials-config"]
-include::{libbeat-xpack-dir}/docs/aws-credentials-config.asciidoc[]
-
:type!: