diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
index fc4fd0197..96e7bbc61 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
@@ -145,14 +145,7 @@
 			
 			var lifecycleClass = applicability.GetLifeCycleName().ToLowerInvariant().Replace(" ", "-");
 			<span class="applicable-info" data-tippy-content="@tooltip">
-				@if (name == "Elastic Stack")
-				{
-					@badgeText
-				}
-				else
-				{
 					@name
-				}
 				<span class="applicable-meta applicable-meta-@lifecycleClass">
 				@if (applicability.Lifecycle != ProductLifecycle.GenerallyAvailable && badgeText == name)
 				{
@@ -160,17 +153,18 @@
 				}
 				@if (applicability.Version is not null and not AllVersions)
 				{
-					if (name == "Elastic Stack")
-					{
-						if (applicability.Version <= currentStackVersion)
+						@if (name != "Elastic Stack" || applicability.Version <= currentStackVersion)
+						{
+							<span class="applicable-version applicable-version-@lifecycleClass">
+								@applicability.Version
+							</span>
+						}
+						else
 						{
-							<span class="applicable-version applicable-version-@lifecycleClass">@applicability.Version</span>
+							<span class="applicable-lifecycle applicable-lifecycle-@lifecycleClass">
+								@badgeText
+							</span>
 						}
-					}
-					else
-					{
-						<span class="applicable-version applicable-version-@lifecycleClass">@applicability.Version</span>
-					}
 				}
 				</span>
 			</span>
diff --git a/tests/authoring/Inline/AppliesToRole.fs b/tests/authoring/Inline/AppliesToRole.fs
index d911e533c..b5fcb830a 100644
--- a/tests/authoring/Inline/AppliesToRole.fs
+++ b/tests/authoring/Inline/AppliesToRole.fs
@@ -29,15 +29,17 @@ This is an inline {applies_to}`stack: preview 9.1` element.
     let ``validate HTML: generates link and alt attr`` () =
         markdown |> convertsToHtml """
         <p>This is an inline
-            <span class="applies-inline">
-                <span class="applicable-info" data-tippy-content="We plan to add this functionality in a future update. Plans may change without notice.">
-                    Planned
-                    <span class="applicable-meta applicable-meta-technical-preview">
-                    </span>
-                </span>
-            </span>
-            element.
-        </p>
+	        <span class="applies-inline">
+		        <span class="applicable-info" data-tippy-content="We plan to add this functionality in a future update. Plans may change without notice.">
+			        Elastic Stack
+			        <span class="applicable-meta applicable-meta-technical-preview">
+				        <span class="applicable-lifecycle applicable-lifecycle-technical-preview">
+					        Planned
+				        </span>
+			        </span>
+		        </span>
+	        </span>
+	        element.</p>
         """