diff --git a/apps/bolt-site/templates/_site-footer.twig b/apps/bolt-site/templates/_site-footer.twig
index 836972e63f..471d363a8b 100644
--- a/apps/bolt-site/templates/_site-footer.twig
+++ b/apps/bolt-site/templates/_site-footer.twig
@@ -6,6 +6,8 @@
   {% set assets = [] %}
 {% endif %}
 
-<script src="{{ assets["bolt-global.js"] | default("/build/bolt-global.js") }}" async></script>
+{% set cacheBuster = bolt.data.config.prod ? "?v=" ~ bolt.data.fullManifest.version : "" %}
+
+<script src="{{ assets["bolt-global.js"] | default("/build/bolt-global.js") }}{{ cacheBuster }}" async></script>
   </body>
 </html>
diff --git a/apps/bolt-site/templates/_site-head.twig b/apps/bolt-site/templates/_site-head.twig
index e818b53d3d..24d10c2398 100644
--- a/apps/bolt-site/templates/_site-head.twig
+++ b/apps/bolt-site/templates/_site-head.twig
@@ -18,6 +18,7 @@
 {% endif %}
 {% set hasSidebar = nestedPages or sidebar %}
 
+{% set cacheBuster = bolt.data.config.prod ? "?v=" ~ bolt.data.fullManifest.version : "" %}
 
 <!DOCTYPE html>
 <html lang="en-US" class="{{ bolt.data.config.prod ? '' : 'js-fonts-loaded' }}">
@@ -56,7 +57,7 @@
     <meta name="twitter:image" content="https://boltdesignsystem.com/images/bolt-logo-480.png" />
     <meta name="twitter:site" content="@pega" />
 
-    <link rel="stylesheet" href="{{ assets["bolt-global.css"] | default("/build/bolt-global.css") }}" media="all" />
+    <link rel="stylesheet" href="{{ assets["bolt-global.css"] | default("/build/bolt-global.css") }}{{ cacheBuster }}" media="all" />
 
     {# @TODO: wire this up to use Critical CSS #}
     <style>
