diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 343d5101c2e95f01d7345b99afe9fb3e308279de..f37d36a60abfe307f1f07de13fb15e41f2ff8bf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,7 @@ changelog:
     name: orhunp/git-cliff:latest
     entrypoint: [""]
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-    # tagging should only happen after the thing was merged, so do it on the main branch build
-    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_TAG
   variables:
     GIT_STRATEGY: clone # clone entire repo instead of reusing workspace
     GIT_DEPTH: 0 # avoid shallow clone to give cliff all the info it needs
diff --git a/cliff.toml b/cliff.toml
index 5fb7cc1fd98a567649e027fca1a5953e837f1d33..649f6cd00bf67775bd16745faae586f75b1a716e 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -68,7 +68,7 @@ commit_parsers = [
 # protect breaking changes from being skipped due to matching a skipping commit_parser
 protect_breaking_commits = false
 # filter out the commits that are not matched by commit parsers
-filter_commits = false
+filter_commits = true
 # regex for matching git tags
 # tag_pattern = "v[0-9].*"
 # regex for skipping tags