diff --git a/cumulus/scripts/ci/changelog/templates/changes.md.tera b/cumulus/scripts/ci/changelog/templates/changes.md.tera
index a6670a7ece..d691da0a53 100644
--- a/cumulus/scripts/ci/changelog/templates/changes.md.tera
+++ b/cumulus/scripts/ci/changelog/templates/changes.md.tera
@@ -14,7 +14,6 @@
 
 {% include "changes_runtime.md.tera" %}
 
-{% include "runtimes.md.tera" -%}
 {% endif %}
 
 {% include "changes_misc.md.tera" %}
diff --git a/cumulus/scripts/ci/changelog/templates/template.md.tera b/cumulus/scripts/ci/changelog/templates/template.md.tera
index 1545951993..ba50fc439b 100644
--- a/cumulus/scripts/ci/changelog/templates/template.md.tera
+++ b/cumulus/scripts/ci/changelog/templates/template.md.tera
@@ -20,15 +20,14 @@ This release contains the changes from `{{ env.REF1 }}` to `{{ env.REF2 }}`.
 {# we will force it to HIGH if at least one host function was detected. #}
 
 {% include "host_functions.md.tera" -%}
+
+{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" -%}
 {% include "global_priority.md.tera" -%}
 {% include "compiler.md.tera" -%}
-{% include "migrations-db.md.tera" -%}
-
-{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" %}
+{% include "migrations-db.md.tera" %}
 <!-- skipping runtime data for RELEASE_TYPE = {{ env.RELEASE_TYPE }} -->
 {% else %}
-{% include "migrations-runtime.md.tera" -%}
-
+{% include "migrations-runtime.md.tera" %}
 {% include "runtimes.md.tera" -%}
 {% endif %}