diff --git a/content/release-notes/whatsnew/changelog-core.markdown b/content/release-notes/whatsnew/changelog-core.markdown
index af7ea7fe6..b0bd2312a 100644
--- a/content/release-notes/whatsnew/changelog-core.markdown
+++ b/content/release-notes/whatsnew/changelog-core.markdown
@@ -8,8 +8,4 @@ aliases:
 
 **See also:** [Enterprise changelog][Enterprise changelog], [Masterfiles changelog][Masterfiles changelog]
 
-<pre>
-
 {{< CFEngine_include_markdown(core/CHANGELOG.md) >}}
-
-</pre>
diff --git a/content/release-notes/whatsnew/changelog-enterprise.markdown b/content/release-notes/whatsnew/changelog-enterprise.markdown
index 52c43685b..4ab90a68c 100644
--- a/content/release-notes/whatsnew/changelog-enterprise.markdown
+++ b/content/release-notes/whatsnew/changelog-enterprise.markdown
@@ -8,8 +8,4 @@ aliases:
 
 **See also:** [Core changelog][Changelog], [Masterfiles changelog][Masterfiles changelog]
 
-<pre>
-
 {{< CFEngine_include_markdown(enterprise/CHANGELOG.md) >}}
-
-</pre>
diff --git a/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown b/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown
index c63416edb..0116776e7 100644
--- a/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown
+++ b/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown
@@ -8,8 +8,4 @@ aliases:
 
 **See also:** [Core changelog][Changelog], [Enterprise changelog][Enterprise changelog]
 
-<pre>
-
 {{< CFEngine_include_markdown(masterfiles/CHANGELOG.md) >}}
-
-</pre>
diff --git a/generator/_scripts/cfdoc_linkresolver.py b/generator/_scripts/cfdoc_linkresolver.py
index c847047dc..bf90c8f64 100644
--- a/generator/_scripts/cfdoc_linkresolver.py
+++ b/generator/_scripts/cfdoc_linkresolver.py
@@ -25,6 +25,12 @@
 import re
 import cfdoc_qa as qa
 
+JIRA_BASE_URL = "https://northerntech.atlassian.net/browse/"
+# Pattern to match Jira ticket references (ENT-1234, CFE-4567, etc.)
+# (?<!/) skips tickets in URLs (/)
+# (?<!\[) and (?!\]) skips inside link text ([])
+JIRA_TICKET_PATTERN = re.compile(r"(?<!/)(?<!\[)(ENT|CFE)-(\d+)\b(?!\])")
+
 
 def run(config):
     markdown_files = config["markdown_files"]
@@ -115,6 +121,13 @@ def headerToAnchor(header):
     return anchor
 
 
+def convertJiraTicketsToLinks(line):
+    """Convert Jira ticket references (ENT-1234, CFE-4567) to markdown links."""
+    return JIRA_TICKET_PATTERN.sub(
+        lambda m: "[%s](%s%s)" % (m[0], JIRA_BASE_URL, m[0]), line
+    )
+
+
 def parseMarkdownForAnchors(file_name, config):
     in_file = open(file_name, "r")
     lines = in_file.readlines()
@@ -305,6 +318,14 @@ def applyLinkMap(file_name, config):
                 else:
                     break
         new_line += markdown_line
+
+        # Convert Jira ticket references to links (only outside code blocks)
+        if not in_pre:
+            original_line = new_line
+            new_line = convertJiraTicketsToLinks(new_line)
+            if new_line != original_line:
+                write_changes = True
+
         new_lines.append(new_line)
         previous_empty = markdown_line.lstrip() == ""