diff --git a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml
index 6fe74a75a2..448b3f4aa1 100644
--- a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml
+++ b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml
@@ -7,7 +7,7 @@ sections:
     description: |
       This section highlights new features in {product} {product-version}.
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
@@ -21,7 +21,7 @@ sections:
     description: |
       This section lists breaking changes in {product} {product-version}.
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
@@ -29,13 +29,13 @@ sections:
       AND fixVersion >= "{version_minor}"
       AND fixVersion <= "{version_patch}"
       ORDER BY key
-    template: with-jira-link
+    template: without-jira-link
   - id: deprecated-functionalities
     title: Deprecated functionalities
     description: |
       This section lists deprecated functionalities in {product} {product-version}.
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
@@ -43,7 +43,7 @@ sections:
       AND fixVersion >= "{version_minor}"
       AND fixVersion <= "{version_patch}"
       ORDER BY key
-    template: with-jira-link
+    template: without-jira-link
   - id: technology-preview
     title: Technology Preview
     description: |
@@ -57,7 +57,7 @@ sections:
       See: link:https://access.redhat.com/support/offerings/techpreview/[Technology Preview support scope].
       ====
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
@@ -65,7 +65,7 @@ sections:
       AND fixVersion >= "{version_minor}"
       AND fixVersion <= "{version_patch}"
       ORDER BY key
-    template: with-jira-link
+    template: without-jira-link
   - id: developer-preview
     title: Developer Preview
     description: |
@@ -78,7 +78,7 @@ sections:
       For more information about the support scope of Red Hat Developer Preview features, see link:https://access.redhat.com/support/offerings/devpreview/[Developer Preview Support Scope].
       ====
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
@@ -86,19 +86,18 @@ sections:
       AND fixVersion >= "{version_minor}"
       AND fixVersion <= "{version_patch}"
       ORDER BY key
-    template: with-jira-link
+    template: without-jira-link
   - id: fixed-issues
     title: Fixed issues
     description: |
       This section lists issues fixed in {product} {product-version}.
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND status in (Closed, "Release Pending")
       AND "Release Note Type" = "Bug Fix"
-      AND fixVersion >= "{version_minor}"
-      AND fixVersion <= "{version_patch}"
+      AND fixVersion ~ "{version_minor_matchall}"
       ORDER BY fixVersion DESC,key
     template: with-z-stream-section
   - id: known-issues
@@ -106,12 +105,11 @@ sections:
     description: |
       This section lists known issues in {product} {product-version}.
     query: >
-      project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
+      project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP)
       AND "Release Note Status" = "Done"
       AND level is EMPTY
       AND "Release Note Type" in ("Known Issue")
-      AND affectedVersion >= "{version_minor}"
-      AND affectedVersion <= "{version_patch}"
+      AND affectedVersion ~ "{version_minor_matchall}"
       AND (fixVersion > "{version_patch}" OR fixVersion is EMPTY)
       ORDER BY key DESC
     template: with-jira-link
diff --git a/modules/release-notes/single-source-release-notes.py b/modules/release-notes/single-source-release-notes.py
index 8f8f720d98..6f01961a1e 100755
--- a/modules/release-notes/single-source-release-notes.py
+++ b/modules/release-notes/single-source-release-notes.py
@@ -31,7 +31,6 @@
 import jinja2
 import yaml
 from jira import JIRA
-from setuptools.dist import sequence
 
 # Define location for product attributes, templates, and generated files.
 script_dir = os.path.normpath(
@@ -60,6 +59,7 @@
       attributes[items[1]] = items[2].strip()
 
 product_version_minor = attributes["product-version"] + ".0"
+product_version_minor_matchall = attributes["product-version"] + ".*"
 product_version_patch = attributes["product-bundle-version"]
 
 # Load the configuration file to get the sections and their Jira queries.
@@ -85,6 +85,7 @@
   # Search in Jira for issues to publish defined in jira_query
   query = section["query"].format(
     version_minor=product_version_minor,
+    version_minor_matchall=product_version_minor_matchall,
     version_patch=product_version_patch
   )
   print(query)