diff --git a/content/docs/howto/constrain-the-length-of-a-string/en.md b/content/docs/howto/constrain-the-length-of-a-string/en.md
index bd9b34e76..0cc0a0268 100644
--- a/content/docs/howto/constrain-the-length-of-a-string/en.md
+++ b/content/docs/howto/constrain-the-length-of-a-string/en.md
@@ -103,5 +103,5 @@ their fields to be of type `string` whilst *also* allowing their byte lengths
 to be constrained.
 
 This pattern will be obsoleted by the `must()` directive, which is tracked
-in this CUE Issue: <https://github.com/cue-lang/cue/issues/575>.
+in {{< issue 575 />}}.
 {{< /info >}}
diff --git a/content/docs/howto/list-no-duplicates/en.md b/content/docs/howto/list-no-duplicates/en.md
index 99426c42b..c19030b61 100644
--- a/content/docs/howto/list-no-duplicates/en.md
+++ b/content/docs/howto/list-no-duplicates/en.md
@@ -32,8 +32,7 @@ items: list.UniqueItems
 
 {{< warning >}}
 Note that this approach does not work correctly on non-integer values.
-See [issue 2192](https://github.com/cue-lang/cue/issues/2192)
-for details.
+See {{< issue 2192 />}} for details.
 {{< /warning >}}
 
 ## Structs
diff --git a/content/docs/reference/cli/_en.md b/content/docs/reference/cli/_en.md
index a9ea27837..52ecc7e1f 100644
--- a/content/docs/reference/cli/_en.md
+++ b/content/docs/reference/cli/_en.md
@@ -6,7 +6,7 @@ toc_hide: false
 
 The `cue` CLI's various subcommands display a variety of help texts.
 
-These texts are presented here as plain text, pending changes proposed in issue
-[`cue-lang/cue#9`](https://github.com/cue-lang/cue/issues/9).
+These texts are presented here as plain text, pending changes proposed in
+{{< issue 9 />}}.
 
 ## Available help texts
diff --git a/hugo/content/en/docs/howto/constrain-the-length-of-a-string/index.md b/hugo/content/en/docs/howto/constrain-the-length-of-a-string/index.md
index 37fac6ca1..f1dbea185 100644
--- a/hugo/content/en/docs/howto/constrain-the-length-of-a-string/index.md
+++ b/hugo/content/en/docs/howto/constrain-the-length-of-a-string/index.md
@@ -103,5 +103,5 @@ their fields to be of type `string` whilst *also* allowing their byte lengths
 to be constrained.
 
 This pattern will be obsoleted by the `must()` directive, which is tracked
-in this CUE Issue: <https://github.com/cue-lang/cue/issues/575>.
+in {{< issue 575 />}}.
 {{< /info >}}
diff --git a/hugo/content/en/docs/howto/list-no-duplicates/index.md b/hugo/content/en/docs/howto/list-no-duplicates/index.md
index 99426c42b..c19030b61 100644
--- a/hugo/content/en/docs/howto/list-no-duplicates/index.md
+++ b/hugo/content/en/docs/howto/list-no-duplicates/index.md
@@ -32,8 +32,7 @@ items: list.UniqueItems
 
 {{< warning >}}
 Note that this approach does not work correctly on non-integer values.
-See [issue 2192](https://github.com/cue-lang/cue/issues/2192)
-for details.
+See {{< issue 2192 />}} for details.
 {{< /warning >}}
 
 ## Structs
diff --git a/hugo/content/en/docs/reference/cli/_index.md b/hugo/content/en/docs/reference/cli/_index.md
index a9ea27837..52ecc7e1f 100644
--- a/hugo/content/en/docs/reference/cli/_index.md
+++ b/hugo/content/en/docs/reference/cli/_index.md
@@ -6,7 +6,7 @@ toc_hide: false
 
 The `cue` CLI's various subcommands display a variety of help texts.
 
-These texts are presented here as plain text, pending changes proposed in issue
-[`cue-lang/cue#9`](https://github.com/cue-lang/cue/issues/9).
+These texts are presented here as plain text, pending changes proposed in
+{{< issue 9 />}}.
 
 ## Available help texts