diff --git a/content/en/agent/configuration/_index.md b/content/en/agent/configuration/_index.md
index d1d1a1329b1..24e4b30beb1 100644
--- a/content/en/agent/configuration/_index.md
+++ b/content/en/agent/configuration/_index.md
@@ -9,6 +9,10 @@ further_reading:
text: "Agent guides"
---
+{{< auto-config >}}
+
+
+
{{< callout url="https://www.datadoghq.com/product-preview/manage-agent-configurations-from-fleet-automation/" >}}
Manage Agent configuration across your Agents centrally in Fleet Automation, at scale. To get access, complete the preview sign-up form. To get started in Fleet Automation, see configure Agents.
{{< /callout >}}
diff --git a/layouts/shortcodes/auto-config.html b/layouts/shortcodes/auto-config.html
new file mode 100644
index 00000000000..c7c925d6029
--- /dev/null
+++ b/layouts/shortcodes/auto-config.html
@@ -0,0 +1,282 @@
+
+
+
Describe what you want to configure and get production-ready, schema-validated Agent YAML.
+ + + + +Research steps
++
+ —
+
+