diff --git a/src/components/AuthorBio/__tests__/__snapshots__/AuthorBio.test.tsx.snap b/src/components/AuthorBio/__tests__/__snapshots__/AuthorBio.test.tsx.snap
index a23c413c7..ad1836617 100644
--- a/src/components/AuthorBio/__tests__/__snapshots__/AuthorBio.test.tsx.snap
+++ b/src/components/AuthorBio/__tests__/__snapshots__/AuthorBio.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`AuthorBio component > should render correctly 1`] = `
       <a
         aria-label="Twitter Profile"
         class="no-underline"
-        href="https://twitter.com/adoptium"
+        href="https://x.com/adoptium"
       >
         <svg
           fill="currentColor"
@@ -49,7 +49,7 @@ exports[`AuthorBio component > should render correctly 1`] = `
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+            d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
           />
         </svg>
       </a>
diff --git a/src/components/BlogAuthor/__tests__/__snapshots__/BlogAuthor.test.tsx.snap b/src/components/BlogAuthor/__tests__/__snapshots__/BlogAuthor.test.tsx.snap
index 5cec4a2be..5d7c004b0 100644
--- a/src/components/BlogAuthor/__tests__/__snapshots__/BlogAuthor.test.tsx.snap
+++ b/src/components/BlogAuthor/__tests__/__snapshots__/BlogAuthor.test.tsx.snap
@@ -53,7 +53,7 @@ exports[`BlogAuthor component > Twitter link - should render correctly 1`] = `
   <a
     aria-label="Twitter Profile"
     class="no-underline"
-    href="https://twitter.com/sample"
+    href="https://x.com/sample"
   >
     <svg
       fill="currentColor"
@@ -65,7 +65,7 @@ exports[`BlogAuthor component > Twitter link - should render correctly 1`] = `
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
-        d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+        d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
       />
     </svg>
   </a>
diff --git a/src/components/BlogAuthor/index.tsx b/src/components/BlogAuthor/index.tsx
index f5ee39820..a38fb7fb9 100644
--- a/src/components/BlogAuthor/index.tsx
+++ b/src/components/BlogAuthor/index.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { FaGithub, FaTwitter, FaLinkedin } from 'react-icons/fa';
+import { FaGithub, FaLinkedin } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 import { Link } from 'gatsby';
 
 import ProfilePic from '../ProfilePic';
@@ -20,7 +21,7 @@ export const TwitterLink = (props) => {
   }
 
   return (
-    <a className='no-underline' aria-label='Twitter Profile' href={`https://twitter.com/${props.name}`}><FaTwitter /></a>
+    <a className='no-underline' aria-label='Twitter Profile' href={`https://x.com/${props.name}`}><FaXTwitter /></a>
   );
 };
 
diff --git a/src/components/Footer/__tests__/__snapshots__/Footer.test.tsx.snap b/src/components/Footer/__tests__/__snapshots__/Footer.test.tsx.snap
index 404f8fa04..f10a699c8 100644
--- a/src/components/Footer/__tests__/__snapshots__/Footer.test.tsx.snap
+++ b/src/components/Footer/__tests__/__snapshots__/Footer.test.tsx.snap
@@ -353,7 +353,7 @@ exports[`Footer component > renders correctly 1`] = `
             <a
               aria-label="Adoptium Twitter Account"
               class="text-muted"
-              href="https://twitter.com/adoptium"
+              href="https://x.com/adoptium"
             >
               <svg
                 fill="currentColor"
@@ -365,7 +365,7 @@ exports[`Footer component > renders correctly 1`] = `
                 xmlns="http://www.w3.org/2000/svg"
               >
                 <path
-                  d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                  d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
                 />
               </svg>
             </a>
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index ccec6732f..53eb219b2 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -1,6 +1,7 @@
 import { Link } from 'gatsby-plugin-react-i18next';
 import React from 'react';
-import { FaTwitter, FaYoutube, FaGithub, FaSlack, FaLinkedin } from 'react-icons/fa';
+import { FaYoutube, FaGithub, FaSlack, FaLinkedin } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 import RandomContributor from '../RandomContributor';
 import LanguageSelector from '../LanguageSelector';
 import './Footer.scss';
@@ -69,7 +70,7 @@ const Footer = (): JSX.Element => {
             </div>
             <ul className="nav col-md-5 col-9 pb-4 justify-content-end list-unstyled d-flex">
               <li className="ms-3"><a href="https://www.netlify.com"> <img src="/images/netlify-light.svg" alt="Deploys by Netlify" style={{height: '25px'}}/> </a></li>
-              <li className="ms-3"><a className="text-muted" aria-label="Adoptium Twitter Account" href="https://twitter.com/adoptium"><FaTwitter size={25} /></a></li>
+              <li className="ms-3"><a className="text-muted" aria-label="Adoptium Twitter Account" href="https://x.com/adoptium"><FaXTwitter size={25} /></a></li>
               <li className="ms-3"><a className="text-muted" aria-label="Adoptium Linkedin Account" href="https://www.linkedin.com/showcase/adoptium/"><FaLinkedin size={25} /></a></li>
               <li className="ms-3"><a className="text-muted" aria-label="Adoptium YouTube Account" href="https://www.youtube.com/c/EclipseAdoptium"><FaYoutube size={25} /></a></li>
               <li className="ms-3"><a className="text-muted" aria-label="Adoptium GitHub Account" href="https://github.com/adoptium"><FaGithub size={25} /></a></li>
diff --git a/src/components/NavBar/__tests__/__snapshots__/NavBar.test.tsx.snap b/src/components/NavBar/__tests__/__snapshots__/NavBar.test.tsx.snap
index 8668c036c..05041dfa7 100644
--- a/src/components/NavBar/__tests__/__snapshots__/NavBar.test.tsx.snap
+++ b/src/components/NavBar/__tests__/__snapshots__/NavBar.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`NavBar component > navbar renders correctly 1`] = `
         >
           <a
             aria-label="Adoptium Twitter Account"
-            href="https://twitter.com/adoptium"
+            href="https://x.com/adoptium"
             rel="noopener noreferrer"
             style="color: rgba(255, 255, 255, 0.55);"
             target="_blank"
@@ -250,7 +250,7 @@ exports[`NavBar component > navbar renders correctly 1`] = `
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
               />
             </svg>
           </a>
diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx
index cfa0b1dc0..8d444dae7 100644
--- a/src/components/NavBar/index.tsx
+++ b/src/components/NavBar/index.tsx
@@ -2,7 +2,8 @@ import * as React from "react"
 import PropTypes from "prop-types"
 import { Link as Noni18nLink } from "gatsby"
 import { Link, useTranslation } from 'gatsby-plugin-react-i18next';
-import { FaTwitter, FaLinkedin, FaYoutube, FaGithub, FaSlack, FaRss } from 'react-icons/fa';
+import { FaLinkedin, FaYoutube, FaGithub, FaSlack, FaRss } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 
 // @ts-ignore
 import Logo from '../../images/adoptium-logo-dark.svg';
@@ -95,7 +96,7 @@ const NavBar = (): JSX.Element => {
           { typeof window !== 'undefined' && window.location.href.includes('/blog') &&
             <li className="ms-3"><Noni18nLink style={navbarIcon} aria-label="Adoptium RSS Feed" to="/rss.xml"><FaRss size={25} /></Noni18nLink></li>
           }
-          <li className="ms-3"><a style={navbarIcon} target="_blank" aria-label="Adoptium Twitter Account" rel="noopener noreferrer" href="https://twitter.com/adoptium"><FaTwitter size={25} /></a></li>
+          <li className="ms-3"><a style={navbarIcon} target="_blank" aria-label="Adoptium Twitter Account" rel="noopener noreferrer" href="https://x.com/adoptium"><FaXTwitter size={25} /></a></li>
           <li className="ms-3">
           <a style={navbarIcon} target="_blank" aria-label="Adoptium LinkedIn Page" rel="noopener noreferrer" href="https://www.linkedin.com/showcase/adoptium/">
           <FaLinkedin size={25} /></a></li>
diff --git a/src/templates/__tests__/__snapshots__/blogPost.test.tsx.snap b/src/templates/__tests__/__snapshots__/blogPost.test.tsx.snap
index 52453159a..72e5f62cc 100644
--- a/src/templates/__tests__/__snapshots__/blogPost.test.tsx.snap
+++ b/src/templates/__tests__/__snapshots__/blogPost.test.tsx.snap
@@ -280,7 +280,7 @@ exports[`BlogPost Template page > renders correctly - featured image 1`] = `
                 <a
                   aria-label="Twitter Profile"
                   class="no-underline"
-                  href="https://twitter.com/adoptium"
+                  href="https://x.com/adoptium"
                 >
                   <svg
                     fill="currentColor"
@@ -292,7 +292,7 @@ exports[`BlogPost Template page > renders correctly - featured image 1`] = `
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                      d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
                     />
                   </svg>
                 </a>
@@ -589,7 +589,7 @@ exports[`BlogPost Template page > renders correctly 1`] = `
                 <a
                   aria-label="Twitter Profile"
                   class="no-underline"
-                  href="https://twitter.com/adoptium"
+                  href="https://x.com/adoptium"
                 >
                   <svg
                     fill="currentColor"
@@ -601,7 +601,7 @@ exports[`BlogPost Template page > renders correctly 1`] = `
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                      d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
                     />
                   </svg>
                 </a>