diff --git a/components/Hero.js b/components/Hero.js
index 81000be487c..9f0c4051555 100644
--- a/components/Hero.js
+++ b/components/Hero.js
@@ -10,9 +10,9 @@ import AlgoliaSearch, { SearchButton } from './AlgoliaSearch'; // Import Algolia
 import IconLoupe from './icons/Loupe';
 import {
   useTranslation,
-} from "next-i18next-static-site";
+} from "i18n-static-site";
 
-export default function Hero({ className = ''}) {
+export default function Hero({ className = '' }) {
 
   const { t } = useTranslation();
 
@@ -34,11 +34,11 @@ export default function Hero({ className = ''}) {
             <strong>industry standard</strong> for defining asynchronous APIs.
           </Heading>
           <div className='flex flex-row items-center justify-center'>
-            <Button className="block md:inline-block" text="Read the docs" href="/docs" icon={<ArrowRight className="-mb-1 h-5 w-5" />} 
-            data-testid="Hero-Button"/>
+            <Button className="block md:inline-block" text="Read the docs" href="/docs" icon={<ArrowRight className="-mb-1 h-5 w-5" />}
+              data-testid="Hero-Button" />
             {/* Wrap SearchButton with AlgoliaSearch component */}
             <AlgoliaSearch>
-              <SearchButton 
+              <SearchButton
                 className="sm:flex items-center text-left space-x-3 px-4 py-3 ml-2 bg-white border-secondary-500 border text-secondary-500 hover:text-white shadow-md bg-secondary-100 hover:bg-secondary-500 transition-all duration-500 ease-in-out rounded-md"
               >
                 {({ actionKey }) => (
diff --git a/components/link.js b/components/link.js
index 4fe488bf107..0f77ba4e39d 100644
--- a/components/link.js
+++ b/components/link.js
@@ -1,6 +1,6 @@
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { defaultLanguage, languages } from "next-i18next-static-site";
+import { defaultLanguage, languages } from "i18n-static-site";
 
 const LinkComponent = ({ children, locale, ...props }) => {
   const router = useRouter();
diff --git a/components/navigation/NavBar.js b/components/navigation/NavBar.js
index 0505adfe386..92745af157a 100644
--- a/components/navigation/NavBar.js
+++ b/components/navigation/NavBar.js
@@ -19,7 +19,7 @@ import {
   defaultLanguage,
   languages,
   useTranslation,
-} from "next-i18next-static-site";
+} from "i18n-static-site";
 
 const isMobile = isMobileDevice();
 const uniqueLangs = [...new Set(["EN", "DE"])].map((repo) => ({
diff --git a/cypress/test/Hero.cy.js b/cypress/test/Hero.cy.js
index d01ce53a0ed..22b8199b796 100644
--- a/cypress/test/Hero.cy.js
+++ b/cypress/test/Hero.cy.js
@@ -5,8 +5,8 @@ describe('Hero Component', () => {
   it('displays the correct content', () => {
     mount(<Hero />);
 
-    cy.contains('Building the future of');
-    cy.contains('Event-Driven Architectures (EDA)');
+    cy.contains('main.header');
+    cy.contains('main.subHeader');
     cy.contains('Open-Source tools to easily build and maintain your event-driven architecture.');
     cy.contains('Read the docs');
     cy.contains('Quick search...');
diff --git a/lib/locales.js b/lib/locales.js
index fe5067a7675..b294cfc65ee 100644
--- a/lib/locales.js
+++ b/lib/locales.js
@@ -1,4 +1,4 @@
-import { languages, namespaces } from "next-i18next-static-site";
+import { languages, namespaces } from "i18n-static-site";
 
 function loadLocales() {
   // Load all locales, required for next-i18n-static-site
diff --git a/next.config.js b/next.config.js
index 3795898a677..2fa348e27cf 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,7 +4,6 @@ const gemoji = require('remark-gemoji-to-emoji');
 const a11yEmoji = require('@fec/remark-a11y-emoji');
 const slug = require('remark-slug');
 const headingId = require('remark-heading-id');
-const { i18n } = require("./next-i18next-static-site.config");
 
 const withMDX = require('@next/mdx')({
   extension: /\.mdx?$/,
@@ -21,7 +20,7 @@ const withMDX = require('@next/mdx')({
   },
 });
 
-const withTM = require("next-transpile-modules")(["next-i18next-static-site"]);
+const withTM = require("next-transpile-modules")(["i18n-static-site"]);
 
 module.exports = withTM(withMDX({
   pageExtensions: ['js', 'md'],
@@ -39,7 +38,4 @@ module.exports = withTM(withMDX({
 
     return config;
   },
-  publicRuntimeConfig: {
-    i18n,
-  },
 }));
diff --git a/package-lock.json b/package-lock.json
index 7a9f82c3214..d70c0b5c75f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,7 @@
         "fuse.js": "^6.6.2",
         "googleapis": "^100.0.0",
         "gray-matter": "^4.0.2",
+        "i18n-static-site": "0.3.2",
         "jgexml": "^0.4.4",
         "lodash": "^4.17.21",
         "markdown-to-txt": "^2.0.1",
@@ -42,7 +43,6 @@
         "mermaid": "9.3.0",
         "moment": "^2.29.4",
         "next": "^12.0.0",
-        "next-i18next-static-site": "^0.3.1",
         "next-mdx-remote": "^4.4.1",
         "next-transpile-modules": "^10.0.0",
         "node-fetch": "^2.6.7",
@@ -51,7 +51,6 @@
         "react-dom": "^17.0.2",
         "react-ga": "^3.1.2",
         "react-gtm-module": "^2.0.11",
-        "react-i18next": "^13.0.1",
         "react-scrollspy": "^3.4.2",
         "react-syntax-highlighter": "12.2.1",
         "react-text-truncate": "^0.16.0",
@@ -6404,6 +6403,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
       "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "peer": true,
       "dependencies": {
         "void-elements": "3.1.0"
       }
@@ -6464,6 +6464,21 @@
       "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
       "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
     },
+    "node_modules/i18n-static-site": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/i18n-static-site/-/i18n-static-site-0.3.2.tgz",
+      "integrity": "sha512-VIvO5jcmKiPEov6WJ7zD/jge2pYdrjxIKCY8pYxzU+fgrsj1zkpU9BttKocpX+8aAftNnVoe5G94j2jlMOlOCg==",
+      "dependencies": {
+        "js-cookie": "^3.0.1"
+      },
+      "peerDependencies": {
+        "i18next": "^21.10.0",
+        "js-cookie": "^3.0.1",
+        "next": "^12.0.0",
+        "react": "^17.0.2",
+        "react-i18next": "^11.18.6"
+      }
+    },
     "node_modules/i18next": {
       "version": "21.10.0",
       "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
@@ -9105,21 +9120,6 @@
         }
       }
     },
-    "node_modules/next-i18next-static-site": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/next-i18next-static-site/-/next-i18next-static-site-0.3.1.tgz",
-      "integrity": "sha512-rl5kdst++xucZz6kVOQfXNc/ZGYJyjq8sfSkFxthV3qnnP17bWq6C8uLyDOHMV98DbujG28To7MW5yH+//Od+g==",
-      "dependencies": {
-        "js-cookie": "^3.0.1"
-      },
-      "peerDependencies": {
-        "i18next": "^21.10.0",
-        "js-cookie": "^3.0.1",
-        "next": "^13.0.0",
-        "react": "^18.2.0",
-        "react-i18next": "^11.18.6"
-      }
-    },
     "node_modules/next-mdx-remote": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/next-mdx-remote/-/next-mdx-remote-4.4.1.tgz",
@@ -10794,15 +10794,16 @@
       "integrity": "sha512-8gyj4TTxeP7eEyc2QKawEuQoAZdjKvMY4pgWfycGmqGByhs17fR+zEBs0JUDq4US/l+vbTl+6zvUIx27iDo/Vw=="
     },
     "node_modules/react-i18next": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.1.tgz",
-      "integrity": "sha512-gMO6N2GfSfuH7xlHSsZ/mZf+Py9bLm/+EDKIn5fNTuDTjcCcwmMU5UEuGCDk5mdfivbo7ySyYXBN7B9tbGUxiA==",
+      "version": "11.18.6",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "peer": true,
       "dependencies": {
-        "@babel/runtime": "^7.22.5",
+        "@babel/runtime": "^7.14.5",
         "html-parse-stringify": "^3.0.1"
       },
       "peerDependencies": {
-        "i18next": ">= 23.2.3",
+        "i18next": ">= 19.0.0",
         "react": ">= 16.8.0"
       },
       "peerDependenciesMeta": {
@@ -12905,6 +12906,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
       "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18112,6 +18114,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
       "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "peer": true,
       "requires": {
         "void-elements": "3.1.0"
       }
@@ -18158,6 +18161,14 @@
       "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
       "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
     },
+    "i18n-static-site": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/i18n-static-site/-/i18n-static-site-0.3.2.tgz",
+      "integrity": "sha512-VIvO5jcmKiPEov6WJ7zD/jge2pYdrjxIKCY8pYxzU+fgrsj1zkpU9BttKocpX+8aAftNnVoe5G94j2jlMOlOCg==",
+      "requires": {
+        "js-cookie": "^3.0.1"
+      }
+    },
     "i18next": {
       "version": "21.10.0",
       "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
@@ -20201,14 +20212,6 @@
         "use-sync-external-store": "1.2.0"
       }
     },
-    "next-i18next-static-site": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/next-i18next-static-site/-/next-i18next-static-site-0.3.1.tgz",
-      "integrity": "sha512-rl5kdst++xucZz6kVOQfXNc/ZGYJyjq8sfSkFxthV3qnnP17bWq6C8uLyDOHMV98DbujG28To7MW5yH+//Od+g==",
-      "requires": {
-        "js-cookie": "^3.0.1"
-      }
-    },
     "next-mdx-remote": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/next-mdx-remote/-/next-mdx-remote-4.4.1.tgz",
@@ -21499,11 +21502,12 @@
       "integrity": "sha512-8gyj4TTxeP7eEyc2QKawEuQoAZdjKvMY4pgWfycGmqGByhs17fR+zEBs0JUDq4US/l+vbTl+6zvUIx27iDo/Vw=="
     },
     "react-i18next": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.1.tgz",
-      "integrity": "sha512-gMO6N2GfSfuH7xlHSsZ/mZf+Py9bLm/+EDKIn5fNTuDTjcCcwmMU5UEuGCDk5mdfivbo7ySyYXBN7B9tbGUxiA==",
+      "version": "11.18.6",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "peer": true,
       "requires": {
-        "@babel/runtime": "^7.22.5",
+        "@babel/runtime": "^7.14.5",
         "html-parse-stringify": "^3.0.1"
       }
     },
@@ -23177,7 +23181,8 @@
     "void-elements": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "peer": true
     },
     "wcwidth": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index ddc7761fc15..66d11918ca4 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "mermaid": "9.3.0",
     "moment": "^2.29.4",
     "next": "^12.0.0",
-    "next-i18next-static-site": "^0.3.1",
     "next-mdx-remote": "^4.4.1",
     "next-transpile-modules": "^10.0.0",
     "node-fetch": "^2.6.7",
@@ -79,7 +78,6 @@
     "react-dom": "^17.0.2",
     "react-ga": "^3.1.2",
     "react-gtm-module": "^2.0.11",
-    "react-i18next": "^13.0.1",
     "react-scrollspy": "^3.4.2",
     "react-syntax-highlighter": "12.2.1",
     "react-text-truncate": "^0.16.0",
@@ -95,7 +93,8 @@
     "swiper": "^8.3.2",
     "tailwind-merge": "^1.3.0",
     "tailwindcss": "^3.1.4",
-    "yaml": "^2.2.2"
+    "yaml": "^2.2.2",
+    "i18n-static-site": "0.3.2"
   },
   "devDependencies": {
     "@cypress/react": "^7.0.3",
diff --git a/pages/[lang]/index.js b/pages/[lang]/index.js
index 36bf2189bda..e061fc82c59 100644
--- a/pages/[lang]/index.js
+++ b/pages/[lang]/index.js
@@ -28,7 +28,7 @@ import NewsroomSection from '../../components/newsroom/NewsroomSection';
 import {
   getAllLanguageSlugs,
   getLanguage,
-} from "next-i18next-static-site";
+} from "i18n-static-site";
 
 function HomePage() {
   return (
diff --git a/pages/_app.js b/pages/_app.js
index 3f61b533ff4..94b9f6132bf 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -12,7 +12,7 @@ import {
   defaultLanguage,
   namespaces,
   defaultNamespace,
-} from "next-i18next-static-site";
+} from "i18n-static-site";
 import loadLocales from "../lib/locales";
 import '../styles/globals.css'
 
diff --git a/pages/casestudies/index.js b/pages/casestudies/index.js
index 567a154e3ff..26f06ba3c20 100644
--- a/pages/casestudies/index.js
+++ b/pages/casestudies/index.js
@@ -5,7 +5,7 @@ import TextLink from '../../components/typography/TextLink';
 import Heading from "../../components/typography/Heading";
 import CaseStudiesList from "../../config/case-studies.json";
 import {
-} from "next-i18next-static-site";
+} from "i18n-static-site";
 
 export default function casestudies() {
   const description =
diff --git a/pages/index.js b/pages/index.js
index 876e6e42566..9fceec457e6 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -24,7 +24,7 @@ import GoogleCalendarButton from '../components/buttons/GoogleCalendarButton';
 import ICSFileButton from '../components/buttons/ICSFileButton';
 import SubscribeButton from '../components/buttons/SubscribeButton';
 import NewsroomSection from '../components/newsroom/NewsroomSection'
-import { languageDetection } from "next-i18next-static-site";
+import { languageDetection } from "i18n-static-site";
 
 function HomePage() {
   languageDetection();
@@ -165,7 +165,7 @@ function HomePage() {
             >
               Platinum Sponsors
             </Heading>
-            <Sponsors className="mt-4" showSupportBanner={ false } />
+            <Sponsors className="mt-4" showSupportBanner={false} />
           </Container>
 
           <Container className="text-center pb-6" wide as="section">
@@ -176,7 +176,7 @@ function HomePage() {
             >
               Gold Sponsors
             </Heading>
-            <GoldSponsors className="mt-4" showSupportBanner={ false } />
+            <GoldSponsors className="mt-4" showSupportBanner={false} />
           </Container>
 
           <Container className="text-center pyb-6" wide as="section">
@@ -187,7 +187,7 @@ function HomePage() {
             >
               Silver Sponsors
             </Heading>
-            <SilverSponsors className="mt-4" showSupportBanner={ false } />
+            <SilverSponsors className="mt-4" showSupportBanner={false} />
           </Container>
 
 
@@ -217,7 +217,7 @@ function HomePage() {
               Email us
             </TextLink> for more info.
           </Paragraph>
-          <SupportUs className="mt-4" showSupportBanner={ false } />
+          <SupportUs className="mt-4" showSupportBanner={false} />
         </Container>
         <Container className="text-center pb-20 mt-8" wide as="section">
           <Heading level="h3" typeStyle="heading-lg" className="mb-4">