diff --git a/ipip-template.md b/ipip-template.md
index b93697e5c..df3e6b87e 100644
--- a/ipip-template.md
+++ b/ipip-template.md
@@ -4,14 +4,12 @@
 date: YYYY-MM-DD
 editors:
   - name: Your Name
+relatedIssues:
+  - link to issue
 ---
 
 # IPIP-0000: InterPlanetary Improvement Proposal Template
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - (add links here)
-
 ## Summary
 
 <!--One paragraph explanation of the IPIP.-->
diff --git a/src/ipips/ipip-0001.md b/src/ipips/ipip-0001.md
index dd5a31a1a..d2a3bdd0f 100644
--- a/src/ipips/ipip-0001.md
+++ b/src/ipips/ipip-0001.md
@@ -6,14 +6,12 @@ editors:
     github: lidel
   - name: wilkyr31d
     github: wilkyr31d
+relatedIssues:
+  - https://github.com/ipfs/specs/issues/286
 ---
 
 # IPIP-0001: Lightweight Improvement Process for IPFS Specifications
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - [ipfs/specs/issues/286](https://github.com/ipfs/specs/issues/286)
-
 This _InterPlanetary Improvement Proposal_ (IPIP) introduces a lightweight
 "request for comments/change" process for the IPFS specifications
 [repository][1].
diff --git a/src/ipips/ipip-0002.md b/src/ipips/ipip-0002.md
index cac3826fe..7c0b7661d 100644
--- a/src/ipips/ipip-0002.md
+++ b/src/ipips/ipip-0002.md
@@ -9,16 +9,14 @@ editors:
   - name: Henrique Dias
     github: hacdias
     url: https://hacdias.com/
+relatedIssues:
+  - https://github.com/ipfs/specs/issues/257
+  - https://github.com/ipfs/kubo/pull/8890
+  - https://github.com/ipfs/ipfs-docs/pull/1275
 ---
 
 # IPIP-0002: _redirects File Support on Web Gateways
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - [ipfs/specs/issues/257](https://github.com/ipfs/specs/issues/257)
-  - [ipfs/kubo/pull/8890](https://github.com/ipfs/kubo/pull/8890)
-  - [ipfs-docs/pull/1275](https://github.com/ipfs/ipfs-docs/pull/1275)
-
 Provide support for URL redirects and rewrites for web sites hosted on Subdomain or DNSLink Gateways, thus enabling support for [single-page applications (SPAs)](https://en.wikipedia.org/wiki/Single-page_application), and avoiding  [link rot](https://en.wikipedia.org/wiki/Link_rot) when moving to IPFS-backed hosting.
 
 ## Motivation
diff --git a/src/ipips/ipip-0288.md b/src/ipips/ipip-0288.md
index e614577e2..dd798c53e 100644
--- a/src/ipips/ipip-0288.md
+++ b/src/ipips/ipip-0288.md
@@ -7,16 +7,14 @@ editors:
     url: https://hacdias.com/
   - name: Marcin Rataj
     github: lidel
+relatedIssues:
+  - https://github.com/ipfs/specs/pull/288
+  - https://github.com/ipfs/go-ipfs/pull/9029
+  - https://github.com/ipfs/go-ipfs/pull/9034
 ---
 
 # IPIP-0288: TAR Response Format on HTTP Gateways
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - [ipfs/specs/pull/288](https://github.com/ipfs/specs/pull/288)
-  - [ipfs/go-ipfs/pull/9029](https://github.com/ipfs/go-ipfs/pull/9029)
-  - [ipfs/go-ipfs/pull/9034](https://github.com/ipfs/go-ipfs/pull/9034)
-
 ## Summary
 
 Add TAR response format to the :cite[path-gateway].
diff --git a/src/ipips/ipip-0328.md b/src/ipips/ipip-0328.md
index 0540b75c4..981c3b61f 100644
--- a/src/ipips/ipip-0328.md
+++ b/src/ipips/ipip-0328.md
@@ -9,18 +9,16 @@ editors:
     github: lidel
   - name: Gus Eggert
     github: guseggert 
+relatedIssues:
+  - https://github.com/ipfs/in-web-browsers/issues/182
+  - https://github.com/ipfs/specs/pull/328
+  - https://github.com/ipfs/kubo/issues/8823
+  - https://github.com/ipfs/kubo/pull/9335
+  - https://github.com/ipfs/kubo/issues/7552
 ---
 
 # IPIP-0328: JSON and CBOR Response Formats on HTTP Gateways
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - [ipfs/in-web-browsers/issues/182]
-  - [ipfs/specs/pull/328]
-  - [ipfs/kubo/issues/8823]
-  - [ipfs/kubo/pull/9335]
-  - [ipfs/go-ipfs/issues/7552]
-
 ## Summary
 
 Add support for the [DAG-JSON], [DAG-CBOR], JSON and CBOR response formats in
diff --git a/src/ipips/ipip-0337.md b/src/ipips/ipip-0337.md
index a062af66a..30b778927 100644
--- a/src/ipips/ipip-0337.md
+++ b/src/ipips/ipip-0337.md
@@ -6,14 +6,12 @@ editors:
     github: guseggert 
   - name: Marcin Rataj
     github: lidel
+relatedIssues:
+  - https://github.com/ipfs/specs/pull/337
 ---
 
 # IPIP-0337: Delegated Content Routing HTTP API
 
-<!-- TODO: MAKE THIS FRONTMATTER FIELD -->
-- Related Issues:
-  - https://github.com/ipfs/specs/pull/337
-
 ## Summary
 
 This IPIP specifies an HTTP API for delegated content routing.