diff --git a/scripts/ci/changelog/README.md b/scripts/ci/changelog/README.md
index 2386f7c1b523..80795438b100 100644
--- a/scripts/ci/changelog/README.md
+++ b/scripts/ci/changelog/README.md
@@ -44,10 +44,9 @@ Currently, the considered labels are:
 - E4 => new host function
 - E2 => database migration
 - B0 => silent, not showing up
-- B1-releasenotes (misc unless other labels)
-- B5-client (client changes)
-- B7-runtimenoteworthy (runtime changes)
-- T6-XCM
+- B1 => noteworthy
+- T0 => node
+- T1 => runtime
 
 Note that labels with the same letter are mutually exclusive.
 A PR should not have both `B0` and `B5`, or both `C1` and `C9`. In case of conflicts, the template will
diff --git a/scripts/ci/changelog/templates/change.md.tera b/scripts/ci/changelog/templates/change.md.tera
index 432b93eb687d..6d133439e2e9 100644
--- a/scripts/ci/changelog/templates/change.md.tera
+++ b/scripts/ci/changelog/templates/change.md.tera
@@ -33,10 +33,5 @@
 {%- set repo = "   " -%}
 {%- endif -%}
 
-{%- if c.meta.T and c.meta.T.value == 6 -%}
-{%- set xcm = " [✉️ XCM]" -%}
-{%- else -%}
-{%- set xcm = "" -%}
-{%- endif -%}
 {{- repo }} {{ audit }}[`#{{c.number}}`]({{c.html_url}}) {{- prio }} - {{ c.title | capitalize | truncate(length=120, end="…") }}{{xcm }}
 {%- endmacro change -%}
diff --git a/scripts/ci/changelog/templates/changes_client.md.tera b/scripts/ci/changelog/templates/changes_client.md.tera
index 36fb6b9de686..5c911407ac90 100644
--- a/scripts/ci/changelog/templates/changes_client.md.tera
+++ b/scripts/ci/changelog/templates/changes_client.md.tera
@@ -9,7 +9,7 @@
     {#- We skip silent ones -#}
     {%- else -%}
 
-        {%- if pr.meta.B.value == 5 and not pr.title is containing("ompanion") %}
+        {%- if pr.meta.T and pr.meta.T.value == 0 and not pr.title is containing("ompanion") %}
 - {{ m_c::change(c=pr) }}
         {%- endif -%}
     {% endif -%}
diff --git a/scripts/ci/changelog/templates/changes_misc.md.tera b/scripts/ci/changelog/templates/changes_misc.md.tera
index 3ad1e1d222b7..9c5662f70ae8 100644
--- a/scripts/ci/changelog/templates/changes_misc.md.tera
+++ b/scripts/ci/changelog/templates/changes_misc.md.tera
@@ -7,7 +7,7 @@
         {%- if pr.meta.B.value == 0 -%}
         {#- We skip silent ones -#}
         {%- else -%}
-            {%- if pr.meta.B and pr.meta.B.value != 5 and pr.meta.B.value != 7 or pr.meta.C or not pr.meta.B %}
+            {%- if pr.meta.T and pr.meta.T.value == 0 %}
 {%- set_global misc_count = misc_count + 1 -%}
             {%- endif -%}
         {% endif -%}
@@ -27,7 +27,7 @@ There are other misc. changes. You can expand the list below to view them all.
         {%- if pr.meta.B.value == 0 %}
         {#- We skip silent ones -#}
         {%- else -%}
-            {%- if pr.meta.B and pr.meta.B.value != 5 and pr.meta.B.value != 7 or pr.meta.C or not pr.meta.B %}
+            {%- if pr.meta.T and pr.meta.T.value == 0 %}
 - {{ m_c::change(c=pr) }}
             {%- endif -%}
         {% endif -%}
diff --git a/scripts/ci/changelog/templates/changes_runtime.md.tera b/scripts/ci/changelog/templates/changes_runtime.md.tera
index 67da1ebbc394..db7f6bff1111 100644
--- a/scripts/ci/changelog/templates/changes_runtime.md.tera
+++ b/scripts/ci/changelog/templates/changes_runtime.md.tera
@@ -10,7 +10,7 @@
 {#- We skip silent ones -#}
 {%- else -%}
 
-{%- if pr.meta.B.value == 7 and not pr.title is containing("ompanion") %}
+{%- if pr.meta.T and pr.meta.T.value == 1 and not pr.title is containing("ompanion") %}
 - {{ m_c::change(c=pr) }}
 {%- endif -%}
 {%- endif -%}
diff --git a/scripts/ci/changelog/templates/high_priority.md.tera b/scripts/ci/changelog/templates/high_priority.md.tera
index 117d335efdc0..aabc9f01f628 100644
--- a/scripts/ci/changelog/templates/high_priority.md.tera
+++ b/scripts/ci/changelog/templates/high_priority.md.tera
@@ -25,7 +25,7 @@ The changes motivating this priority level are:
     {%- if pr.meta.C -%}
         {%- if pr.meta.C.value == p %}
 - {{ m_c::change(c=pr) }}
-{%- if pr.meta.B and pr.meta.B.value == 7 %} (RUNTIME)
+{%- if pr.meta.T and pr.meta.T.value == 1 %} (RUNTIME)
 {% endif %}
         {%- endif -%}
     {%- endif -%}