diff --git a/src/components/RandomContributor/index.tsx b/src/components/RandomContributor/index.tsx
index c96994bb5..f846176e1 100644
--- a/src/components/RandomContributor/index.tsx
+++ b/src/components/RandomContributor/index.tsx
@@ -2,7 +2,8 @@ import React, { MutableRefObject, useRef } from 'react';
 import { useAdoptiumContributorsApi, useOnScreen } from '../../hooks';
 import './RandomContributor.scss';
 import AnimatedPlaceholder from '../AnimatedPlaceholder';
-import { Trans, Link } from 'gatsby-plugin-react-i18next';
+import { Trans } from 'gatsby-plugin-react-i18next';
+import LinkText from '../LinkText'
 
 const RandomContributor = (): JSX.Element => {
   const ref = useRef<HTMLDivElement | null>(null);
@@ -31,9 +32,9 @@ const RandomContributor = (): JSX.Element => {
               i18nKey="asciidoc.random.contributor.text" 
               defaults='Thank you <profileUri>{{login}}</profileUri> for making <commitsListUri>{{contributionsCount}} contribution(s)</commitsListUri> to <repoUri>{{repo}}</repoUri>' 
               components={{
-                profileUri: <Link to={contributor.profileUri} target="_blank" rel="nofollow noopener noreferrer" />, 
-                commitsListUri: <Link to={contributor.commitsListUri} target="_blank" rel="nofollow noopener noreferrer"/>,
-                repoUri: <Link to={`https://github.com/adoptium/${contributor.repo}`} target="_blank" rel="nofollow noopener noreferrer"/>,
+                profileUri: <LinkText href={contributor.profileUri} />, 
+                commitsListUri: <LinkText href={contributor.commitsListUri} />,
+                repoUri: <LinkText href={`https://github.com/adoptium/${contributor.repo}`} />,
               }}
               values={{
                 'login': contributor.login, 
diff --git a/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap b/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
index 5b586c320..34e99e74c 100644
--- a/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
+++ b/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
@@ -63,6 +63,8 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
     </a>
     <a
       href="https://mock-link"
+      rel="noreferrer"
+      target="_blank"
     >
       <svg
         fill="currentColor"
diff --git a/src/components/TemurinDownloadTable/index.tsx b/src/components/TemurinDownloadTable/index.tsx
index 6ea23644c..ef56f2de9 100644
--- a/src/components/TemurinDownloadTable/index.tsx
+++ b/src/components/TemurinDownloadTable/index.tsx
@@ -7,6 +7,7 @@ import { capitalize } from '../../util/capitalize';
 import { localeDate } from '../../util/localeDate';
 import { IoMdHelpBuoy } from 'react-icons/io';
 import { PiFiles } from 'react-icons/pi';
+import LinkText from '../LinkText'
 
 const TemurinDownloadTable = ({results}) => {
     const { language } = useI18next();
@@ -21,8 +22,8 @@ const TemurinDownloadTable = ({results}) => {
         {source &&
             <p className='release-notes'>
                 <Link to={`/temurin/release-notes?version=${source.release_name}`}><MdNotes /><Trans>Release Notes</Trans></Link> 
-                <Link to="/installation/"><IoMdHelpBuoy /><Trans>Installation Guide</Trans></Link>
-                <Link to={source.binary.package.link}><PiFiles /><Trans>Source Code</Trans></Link> 
+                <Link to="/installation/"><IoMdHelpBuoy /><Trans>Installation Guide</Trans></Link> 
+                <LinkText href={source.binary.package.link}><PiFiles /><Trans>Source Code</Trans></LinkText>
             </p>
         }
         <table id="download-table" className="table table-bordered releases-table" style={{borderSpacing: '0 10px', borderCollapse: 'separate'}}>