diff --git a/apps/website/next.config.js b/apps/website/next.config.js
index 9fbd271ae1..2f78fb96bd 100644
--- a/apps/website/next.config.js
+++ b/apps/website/next.config.js
@@ -13,8 +13,8 @@ module.exports = {
     return config;
   },
   reactStrictMode: true,
-  assetPrefix: process.env.NODE_ENV === "production" ? `/halstack/${process.env.SITE_VERSION}` : undefined,
-  basePath: process.env.NODE_ENV === "production" ? `/halstack/${process.env.SITE_VERSION}` : undefined,
+  assetPrefix: process.env.NODE_ENV === "production" ? `/halstack/${process.env.NEXT_PUBLIC_SITE_VERSION}` : undefined,
+  basePath: process.env.NODE_ENV === "production" ? `/halstack/${process.env.NEXT_PUBLIC_SITE_VERSION}` : undefined,
   transpilePackages: [
     "@cloudscape-design/components",
     "@cloudscape-design/component-toolkit",
diff --git a/apps/website/screens/principles/typography/code/TypographyCodePage.tsx b/apps/website/screens/principles/typography/code/TypographyCodePage.tsx
index 01caa9cfcc..d79cd5b7fa 100644
--- a/apps/website/screens/principles/typography/code/TypographyCodePage.tsx
+++ b/apps/website/screens/principles/typography/code/TypographyCodePage.tsx
@@ -14,19 +14,19 @@ const sections = [
     title: "Examples",
     subSections: [
       {
-        title: "Heading",
+        title: "Heading basic usage",
         content: <Example example={headingBasicUsage} defaultIsVisible />,
       },
       {
-        title: "Paragraph",
+        title: "Paragraph basic usage",
         content: <Example example={paragraphBasicUsage} defaultIsVisible />,
       },
       {
-        title: "Bulleted list",
+        title: "Bulleted list basic usage",
         content: <Example example={bulletedListBasicUsage} defaultIsVisible />,
       },
       {
-        title: "Typography",
+        title: "Typography basic usage",
         content: <Example example={typographyBasicUsage} defaultIsVisible />,
       },
     ],
diff --git a/scripts/release-website.js b/scripts/release-website.js
index 9e9b95153d..e551bdb27f 100644
--- a/scripts/release-website.js
+++ b/scripts/release-website.js
@@ -56,7 +56,7 @@ const buildSite = (version) => {
   return new Promise((resolve, reject) => {
     console.log(`Building site with version ${version}`);
     exec(
-      `cd apps/website && SITE_VERSION=${version} npm run build`,
+      `cd apps/website && NEXT_PUBLIC_SITE_VERSION=${version} npm run build`,
       (error, stdout, stderr) => {
         if (error) {
           throw new Error(error.message);