diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index c8984c8dcd2bfc4a1e1235498e2d1a1f4657edc5..a3597a71cbed6c3ec662410b322efad079825587 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -35,6 +35,14 @@ repo_checkout:
 
 changelog:
   extends: .changelog
+  rules:
+    when: always
+{% if CI_COMMIT_TAG is defined %}
+    allow_failure: false
+{% else %}
+    allow_failure: true
+{% endif %}
+
 
 build-version:
   extends: .build_version
diff --git a/build-pipeline.yml b/build-pipeline.yml
index a2961c9a812bd8cfdb147f2dfa1d9333cf87c4ad..e906d8b0f7781cf871a7b66ff8f950d5bd8b52ad 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -242,7 +242,7 @@ workflow:
 
 .changelog:
   extends: .infrastructure
-  timeout: 15m
+  timeout: 30m
   script:
     - PROJECT_ARGS=""
     - for project in ${CHANGELOG_PROJECTS}; do