diff --git a/src/Elastic.Documentation.Configuration/Versions/Version.cs b/src/Elastic.Documentation.Configuration/Versions/Version.cs
index 45aa42893..fac57f1e0 100644
--- a/src/Elastic.Documentation.Configuration/Versions/Version.cs
+++ b/src/Elastic.Documentation.Configuration/Versions/Version.cs
@@ -82,7 +82,9 @@ public enum VersioningSystemId
 	[Display(Name = "edot_php")]
 	EdotPhp,
 	[Display(Name = "edot_python")]
-	EdotPython
+	EdotPython,
+	[Display(Name = "edot_cf_aws")]
+	EdotCfAws
 }
 
 [YamlSerializable]
diff --git a/src/Elastic.Documentation.Configuration/versions.yml b/src/Elastic.Documentation.Configuration/versions.yml
index ea364d65b..42ff61931 100644
--- a/src/Elastic.Documentation.Configuration/versions.yml
+++ b/src/Elastic.Documentation.Configuration/versions.yml
@@ -85,3 +85,7 @@ versioning_systems:
   edot_python:
     base: 1.0
     current: 1.3.0
+  edot_cf_aws:
+    base: 0.1
+    current: 0.1.6
+  
\ No newline at end of file
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
index 1a357020f..4c852be6e 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
@@ -183,43 +183,49 @@
 
 	if (pa.EdotIos is not null)
 	{
-		@RenderProduct("EDOT iOS", "Elastic Distributions of OpenTelemetry for iOS", VersioningSystemId.EdotIos, pa.EdotIos)
+		@RenderProduct("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos, pa.EdotIos)
 		;
 	}
 
 	if (pa.EdotAndroid is not null)
 	{
-		@RenderProduct("EDOT Android", "Elastic Distributions of OpenTelemetry for Android", VersioningSystemId.EdotAndroid, pa.EdotAndroid)
+		@RenderProduct("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid, pa.EdotAndroid)
 		;
 	}
 
 	if (pa.EdotDotnet is not null)
 	{
-		@RenderProduct("EDOT .NET", " Elastic Distributions of OpenTelemetry for .NET", VersioningSystemId.EdotDotnet, pa.EdotDotnet)
+		@RenderProduct("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet, pa.EdotDotnet)
 		;
 	}
 
 	if (pa.EdotJava is not null)
 	{
-		@RenderProduct("EDOT Java", "Elastic Distributions of OpenTelemetry for Java", VersioningSystemId.EdotJava, pa.EdotJava)
+		@RenderProduct("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava, pa.EdotJava)
 		;
 	}
 
 	if (pa.EdotNode is not null)
 	{
-		@RenderProduct("EDOT Node.js", "Elastic Distributions of OpenTelemetry for Node.js", VersioningSystemId.EdotNode, pa.EdotNode)
+		@RenderProduct("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode, pa.EdotNode)
 		;
 	}
 
 	if (pa.EdotPhp is not null)
 	{
-		@RenderProduct("EDOT PHP", "Elastic Distributions of OpenTelemetry for PHP", VersioningSystemId.ApmAgentPhp, pa.EdotPhp)
+		@RenderProduct("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.ApmAgentPhp, pa.EdotPhp)
 		;
 	}
 
 	if (pa.EdotPython is not null)
 	{
-		@RenderProduct("EDOT Python", "Elastic Distributions of OpenTelemetry for Python", VersioningSystemId.EdotPython, pa.EdotPython)
+		@RenderProduct("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython, pa.EdotPython)
+		;
+	}
+
+	if (pa.EdotCfAws is not null)
+	{
+		@RenderProduct("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws, pa.EdotCfAws)
 		;
 	}
 }
diff --git a/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs b/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs
index 9568cb44e..7f50998af 100644
--- a/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs
+++ b/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs
@@ -174,6 +174,9 @@ public record ProductApplicability
 
 	[YamlMember(Alias = "edot_python")]
 	public AppliesCollection? EdotPython { get; set; }
+
+	[YamlMember(Alias = "edot_cf_aws")]
+	public AppliesCollection? EdotCfAws { get; set; }
 }
 
 public class ApplicableToConverter : IYamlTypeConverter
@@ -185,7 +188,7 @@ public class ApplicableToConverter : IYamlTypeConverter
 		"elasticsearch", "observability", "security",
 		"ecctl", "curator",
 		"apm_agent_android","apm_agent_dotnet", "apm_agent_go", "apm_agent_ios", "apm_agent_java", "apm_agent_node", "apm_agent_php", "apm_agent_python", "apm_agent_ruby", "apm_agent_rum",
-		"edot_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python"
+		"edot_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python", "edot_cf_aws"
 	];
 
 	public bool Accepts(Type type) => type == typeof(ApplicableTo);
@@ -393,7 +396,8 @@ private static bool TryGetProductApplicability(Dictionary<object, object?> dicti
 			{ "edot_java", a => productAvailability.EdotJava = a },
 			{ "edot_node", a => productAvailability.EdotNode = a },
 			{ "edot_php", a => productAvailability.EdotPhp = a },
-			{ "edot_python", a => productAvailability.EdotPython = a }
+			{ "edot_python", a => productAvailability.EdotPython = a },
+			{ "edot_cf_aws", a => productAvailability.EdotCfAws = a }
 		};
 
 		foreach (var (key, action) in mapping)