diff --git a/apps/charterafrica/src/components/Tool/Tool.js b/apps/charterafrica/src/components/Tool/Tool.js
index f5d7eb4df..fa49245e8 100644
--- a/apps/charterafrica/src/components/Tool/Tool.js
+++ b/apps/charterafrica/src/components/Tool/Tool.js
@@ -62,21 +62,20 @@ const Tool = React.forwardRef(function Tool(props, ref) {
                 <RichTypography color="neutral.dark" variant="h2SemiBold">
                   {name}
                 </RichTypography>
-                <Button
-                  component={externalLink?.href ? Link : undefined}
-                  href={externalLink?.href}
-                >
-                  <SvgIcon
-                    inheritViewBox
-                    component={ExternalLink}
-                    sx={{
-                      color: "text.primary",
-                      fill: "none",
-                      height: 32,
-                      width: 32,
-                    }}
-                  />
-                </Button>
+                {externalLink?.href ? (
+                  <Link href={externalLink?.href}>
+                    <SvgIcon
+                      inheritViewBox
+                      component={ExternalLink}
+                      sx={{
+                        color: "text.primary",
+                        fill: "none",
+                        height: 32,
+                        width: 32,
+                      }}
+                    />
+                  </Link>
+                ) : null}
               </Box>
             </Grid>
             <Grid item>
diff --git a/apps/charterafrica/src/components/Tool/Tool.snap.js b/apps/charterafrica/src/components/Tool/Tool.snap.js
index 61ee90b68..addd3cd7b 100644
--- a/apps/charterafrica/src/components/Tool/Tool.snap.js
+++ b/apps/charterafrica/src/components/Tool/Tool.snap.js
@@ -34,17 +34,6 @@ exports[`<Tool /> renders unchanged 1`] = `
               >
                 Tool Name
               </div>
-              <button
-                class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-18jkoo-MuiButtonBase-root-MuiButton-root"
-                tabindex="0"
-                type="button"
-              >
-                <div
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mg30as-MuiSvgIcon-root"
-                  focusable="false"
-                />
-              </button>
             </div>
           </div>
           <div
diff --git a/apps/charterafrica/src/lib/data/common/processPageTools.js b/apps/charterafrica/src/lib/data/common/processPageTools.js
index 7d0470850..554bbc8a9 100644
--- a/apps/charterafrica/src/lib/data/common/processPageTools.js
+++ b/apps/charterafrica/src/lib/data/common/processPageTools.js
@@ -33,21 +33,6 @@ const queryBuilder = (query) => {
   return where;
 };
 
-const getRepoLink = (tool) => {
-  if (!tool.externalId) {
-    return null;
-  }
-  switch (tool.source) {
-    case "github":
-      return `https://github.com/${tool.externalId.replace(
-        "https://github.com/",
-        "",
-      )}`;
-    default:
-      return "";
-  }
-};
-
 async function processPageSingleTool(page, api, context) {
   const { params, locale } = context;
   const { slug: collection } = page;
@@ -85,11 +70,11 @@ async function processPageSingleTool(page, api, context) {
         ...tool,
         slug: "tool",
         contribute: {
-          href: getRepoLink(tool),
+          href: tool.repoLink,
           label: filterLabels.contribute,
         },
         goToRepo: {
-          href: getRepoLink(tool),
+          href: tool.repoLink,
           label: filterLabels.goToRepo,
         },
         topicLabel: filterLabels.theme,