diff --git a/nuxt/components/content/SiteValue.vue b/nuxt/components/content/SiteValue.vue
new file mode 100644
index 0000000000..5dbbf7f7fd
--- /dev/null
+++ b/nuxt/components/content/SiteValue.vue
@@ -0,0 +1,11 @@
+{{ value }}
+
+
diff --git a/nuxt/content/handbook/marketing/messaging.md b/nuxt/content/handbook/marketing/messaging.md
index 1a2ef7dc43..7b651314e5 100644
--- a/nuxt/content/handbook/marketing/messaging.md
+++ b/nuxt/content/handbook/marketing/messaging.md
@@ -73,16 +73,22 @@ FlowFuse is the open-source Industrial Application Platform.
### Tagline
-{{ site.messaging.tagLine }}
+:site-value{path="messaging.tagLine"}
### FlowFuse in one sentence - Under 150 characters
-{{ site.messaging.subtitle }}
+:site-value{path="messaging.subtitle"}
### About FlowFuse - Short form
-FlowFuse is the enterprise platform that bridges the gap between physical assets and enterprise IT, delivering consistency at scale instead of one-off project "snowflakes." Powered by Node-RED, teams unify real-time data through workflows, AI agents, and industrial applications, extending rigid vendor systems with a low-code agility layer that adapts without rip-and-replace. FlowFuse orchestrates lightweight, event-based data flows between the shop floor and the top floor only when real-world events occur, giving organizations the confidence to innovate and unlock new value in industrial automation.
-
+FlowFuse is the enterprise platform that bridges the gap between physical assets
+and enterprise IT, delivering consistency at scale instead of one-off project
+"snowflakes." Powered by Node-RED, teams unify real-time data through workflows,
+AI agents, and industrial applications, extending rigid vendor systems with a
+low-code agility layer that adapts without rip-and-replace. FlowFuse
+orchestrates lightweight, event-based data flows between the shop floor and the
+top floor only when real-world events occur, giving organizations the confidence
+to innovate and unlock new value in industrial automation.
## FlowFuse in-depth
diff --git a/nuxt/content/handbook/marketing/website.md b/nuxt/content/handbook/marketing/website.md
index 8dac50d845..b7a2442a69 100644
--- a/nuxt/content/handbook/marketing/website.md
+++ b/nuxt/content/handbook/marketing/website.md
@@ -91,7 +91,7 @@ They are still output in the HTML on 11ty-served pages and may be used by site-s
### Default Keywords
-By default, each 11ty-served webpage on the FlowFuse website includes a set of predefined keywords: **{{ site.messaging.keywords }}**. These default keywords are relevant to the overall theme of the website.
+By default, each 11ty-served webpage on the FlowFuse website includes a set of predefined keywords: **:site-value{path="messaging.keywords"}**. These default keywords are relevant to the overall theme of the website.
### Priority of Keywords