diff --git a/.cruft.json b/.cruft.json
index 22d65114..112a32f7 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/robert-koch-institut/mex-template",
-  "commit": "725373d3dd6c8796cc024512008d7c44f2372045",
+  "commit": "cb3e3d333821efcad066b39a0ba3adf3c9794652",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml
index 93af6a65..38243bc5 100644
--- a/.github/workflows/cookiecutter.yml
+++ b/.github/workflows/cookiecutter.yml
@@ -77,10 +77,10 @@ jobs:
           git checkout -b cruft/cookiecutter-template-${template_ref}
           cruft update --skip-apply-ask
           printf '# Changes\n\n- bumped cookiecutter template to %s/commit/%s\n' "$template_url" "$template_ref" > .cruft-pr-body
-          if [[ $(git status --porcelain | grep .rej | wc -c) -ne 0 ]]; then
+          if [[ $(find . -type f -name "*.rej" | wc -l) -ne 0 ]]; then
             printf '\n# Conflicts\n' > .cruft-pr-body
           fi
-          git status --porcelain | grep .rej | awk '{print $2;}' | while read -r line ; do
+          find . -type f -name "*.rej" | while read -r line ; do
             printf '\n```' >> .cruft-pr-body
             cat ${line} >> .cruft-pr-body
             printf '```\n' >> .cruft-pr-body