diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index bfe5986d..d99bc48a 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -1,4 +1,4 @@
-name: Build & Test & Push Image
+name: Changelog
 on:
   push:
     branches:
diff --git a/.github/workflows/prs.yaml b/.github/workflows/prs.yaml
index 525ca239..21f03d08 100644
--- a/.github/workflows/prs.yaml
+++ b/.github/workflows/prs.yaml
@@ -8,6 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: PR Conventional Commit Validation
-        uses: ytanikin/PRConventionalCommits@1.3.0
+        uses: f-eld-ch/PRConventionalCommits@main
         with:
           task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert", "security"]'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8114ab6b..3172f7a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,9 @@
 ### ⚙️  Other
 
 - *(deps)* Bump ytanikin/PRConventionalCommits from 1.1.0 to 1.3.0 ([#450](https://github.com/f-eld-ch/sitrep/issues/450)) - ([c8ed466](https://github.com/f-eld-ch/sitrep/commit/c8ed466fea65fda46f15826a8aae3332b6f0bb8a))
+- Use forked ConventionalCommits validation workflow ([#453](https://github.com/f-eld-ch/sitrep/issues/453)) - ([0c28812](https://github.com/f-eld-ch/sitrep/commit/0c28812b18868a4e3d8636b84aba88c6acdb107e))
 - Use dedicated app for changelog ([#451](https://github.com/f-eld-ch/sitrep/issues/451)) - ([4864691](https://github.com/f-eld-ch/sitrep/commit/486469108df6eb4654f7d872ab877a16ad2fb84e))
 
-## New Contributors ❤️
-
-* @ made their first contribution
 
 ## [24.10.0](https://github.com/f-eld-ch/sitrep/compare/v24.9.0..v24.10.0) - 2024-10-01
 
diff --git a/cliff.toml b/cliff.toml
index 69688b21..5efafcd7 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -49,10 +49,10 @@ body = """
     {% endfor -%}
 {% endfor -%}
 {%- if github -%}
-{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+{% if github.contributors | filter(attribute="is_first_time", value=true) | filter(attribute="username") | length != 0 %}
   ## New Contributors ❤️
 {% endif %}\
-{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) | filter(attribute="username") %}
   * @{{ contributor.username }} made their first contribution
     {%- if contributor.pr_number %} in \
       [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \