diff --git a/app/views/design-system/dfe-frontend/sass-documentation/index.html b/app/views/design-system/dfe-frontend/sass-documentation/index.html
index 642c0019..c52944a9 100644
--- a/app/views/design-system/dfe-frontend/sass-documentation/index.html
+++ b/app/views/design-system/dfe-frontend/sass-documentation/index.html
@@ -24,7 +24,7 @@ <h2 class="govuk-heading-s">Last updated</h2>
 
     <div class="govuk-grid-column-one-quarter">
       <h2 class="govuk-heading-s">Package</h2>
-      <a href="https://www.npmjs.com/package/dfe-frontend-alpha" target="_blank"  class="govuk-!-font-weight-bold">NPM Package</a>
+      <a href="https://www.npmjs.com/package/dfe-frontend-alpha" target="_blank"  class="govuk-link">NPM Package</a>
     </div>
 
   </div>
diff --git a/app/views/design-system/prototype-kit/github-and-heroku.html b/app/views/design-system/prototype-kit/github-and-heroku.html
index a5cc4a56..d15c75b3 100644
--- a/app/views/design-system/prototype-kit/github-and-heroku.html
+++ b/app/views/design-system/prototype-kit/github-and-heroku.html
@@ -1,4 +1,3 @@
-
 {% set pageName = "GitHub and Heroku" %}
 {% set pageDescription = "Storing your prototype kit code securely and using Heroku to run prototypes for testing with users." %}
 {% set selectedNav = "Design system" %}
@@ -10,12 +9,12 @@
 {% block beforeContent %}{% endblock %}
 
 {% block content %}
-{% markdown %}
+    {% markdown %}
 
 
 ## Storing your code in GitHub
 
-Prototypes should be stored as repositories in the <a href="https://github.com/DFE-Digital"  target="_blank" rel="noopener noreferrer">GitHub DFE-Digital</a> organisation account.
+Prototypes should be stored as repositories in the <a href="https://github.com/DFE-Digital" class="govuk-link" target="_blank" rel="noopener noreferrer">GitHub DFE-Digital</a> organisation account.
 
 You can request access to the DfE-Digital organisation GitHub through Digital Tools support on slack.
 
@@ -27,16 +26,16 @@
 
 Depending on what testing you plan to do with users, you might want to run your prototype as a website, rather than on your local device.
 
-We use <a href="https://www.heroku.com/"  target="_blank" rel="noopener noreferrer">Heroku</a> to host prototypes. Most teams have been set up to be able to run prototypes using Heroku Enterprise. 
+We use <a href="https://www.heroku.com/" class="govuk-link"  target="_blank" rel="noopener noreferrer">Heroku</a> to host prototypes. Most teams have been set up to be able to run prototypes using Heroku Enterprise. 
 
-If you are unsure if your team has a Heroku team set up, contact: <a href="mailto:design.ops@education.gov.uk?subject=Heroku Team enquiry&body=Team or Service name:">design.ops@education.gov.uk</a>. We can help with getting your team created or adding you if it already exists.
+If you are unsure if your team has a Heroku team set up, contact: <a href="/design-ops/contact" class="govuk-link">Design Ops</a>. We can help with getting your team created or adding you if it already exists.
 
 <div class="govuk-inset-text">
-    
-<strong>Heroku is not free</strong>
-<p>Your programme will be cross-charged approximately £6 a month for each prototype that is run in your team space.</p>
-<p>If you are unsure about using Heroku, contact <a href="mailto:design.ops@education.gov.uk">design.ops@education.gov.uk</a></p>
-</div>
+        <strong>Heroku is not free</strong>
+        <p>Your programme will be cross-charged approximately £6 a month for each prototype that is run in your team space.</p>
+        <p>If you are unsure about using Heroku, contact <a href="/design-ops/contact" class="govuk-link" >Design Ops</a>
+        </p>
+    </div>
 
 ### Secure your prototype from accidental use
 
diff --git a/app/views/design-system/prototype-kit/index.html b/app/views/design-system/prototype-kit/index.html
index a5abbc2b..1df607dd 100644
--- a/app/views/design-system/prototype-kit/index.html
+++ b/app/views/design-system/prototype-kit/index.html
@@ -18,7 +18,7 @@
 
 The current version of the kit is version 13, and is recommended you use this to build prototypes with. 
 
-You can <a href="https://prototype-kit.service.gov.uk/docs/create-new-prototype" target="_blank">follow instructions to get the kit running on your device</a> as well as tutorials and support from the GDS team who built the kit.
+You can <a href="https://prototype-kit.service.gov.uk/docs/create-new-prototype" class="govuk-link" rel="noopener noreferrer" target="_blank">follow instructions to get the kit running on your device</a> as well as tutorials and support from the GDS team who built the kit.
 
 This helps you de-risk your service, without commiting to building the real thing in code, or needing a developer to build something for you.
 
@@ -34,7 +34,7 @@
 
 ### Windows device users
 
-If you're a DfE-issued Windows device users, you'll need to submit a request to  <a href="https://dfe.service-now.com/serviceportal?id=sc_cat_item&sys_id=2f8ef25b1b76f450199d6397b04bcbc4" target="_blank" rel="noopener noreferrer">Service Now - GDS Prototyping</a>
+If you're a DfE-issued Windows device users, you'll need to submit a request to  <a href="https://dfe.service-now.com/serviceportal?id=sc_cat_item&sys_id=2f8ef25b1b76f450199d6397b04bcbc4" target="_blank" class="govuk-link" rel="noopener noreferrer" >Service Now - GDS Prototyping</a>
 
 When you install the kit, create a folder on the C:\ drive called "prototypes" and extract the kit to a folder within your prototypes folder.
 
@@ -46,8 +46,8 @@
 
 The kit is used across Government, is built by, managed and supported by a team in GDS. 
 
-- Cross-gov <a href="https://ukgovernmentdigital.slack.com/archives/C0647LW4R"  target="_blank" rel="noopener noreferrer"> #prototype-kit</a> Slack channel
-- DfE-specific <a href="https://ukgovernmentdfe.slack.com/archives/C03RS042ZB3"  target="_blank" rel="noopener noreferrer"> #prototyping-help</a> Slack channel
+- Cross-gov <a href="https://ukgovernmentdigital.slack.com/archives/C0647LW4R"  target="_blank" class="govuk-link" rel="noopener noreferrer" > #prototype-kit</a> Slack channel
+- DfE-specific <a href="https://ukgovernmentdfe.slack.com/archives/C03RS042ZB3"  target="_blank" class="govuk-link" rel="noopener noreferrer" > #prototyping-help</a> Slack channel
 
 
 ## Branding your prototype
@@ -60,13 +60,13 @@
 
 ### Services intended for education.gov.uk
 
-You should follow the <a href="/design-system/dfe-frontend">DfE Frontend guidance</a> so that your prototype is using the correct DfE branding and styles.
+You should follow the <a href="/design-system/dfe-frontend"  class="govuk-link" rel="noopener noreferrer">DfE Frontend guidance</a> so that your prototype is using the correct DfE branding and styles.
 
-If you are unsure, [contact Design Ops](/design-ops/contact)
+If you are unsure, <a href="/design-ops/contact"  class="govuk-link">contact Design Ops</a>. 
 
 ## Hosting and securing your prototype
 
-<a href="/design-system/prototype-kit/github-and-heroku#secure-your-prototype-from-accidental-use">Guidance for hosting and setting a password</a> to enable testing and prevent users from accidentally using your prototype.
+<a href="/design-system/prototype-kit/github-and-heroku#secure-your-prototype-from-accidental-use" class="govuk-link" rel="noopener noreferrer" >Guidance for hosting and setting a password</a> to enable testing and prevent users from accidentally using your prototype.
 
 {% endmarkdown %}
 {% endblock %}
\ No newline at end of file