diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index a348f89..dc545c1 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -51,11 +51,10 @@ jobs:
         run: |
           BEFORE="${{ github.event.before }}"
           if [ -n "$BEFORE" ] && [ "$BEFORE" != "0000000000000000000000000000000000000000" ] && git cat-file -e "$BEFORE" 2>/dev/null; then
-            BASE_REF="$BEFORE"
+            CHANGED=$(git diff --name-only "$BEFORE" "${{ github.sha }}")
           else
-            BASE_REF="HEAD~1"
+            CHANGED=$(git diff --name-only HEAD~1 HEAD)
           fi
-          CHANGED=$(git diff --name-only "$BASE_REF" "${{ github.sha }}")
           echo "Changed files:"
           echo "$CHANGED"
 
@@ -128,7 +127,7 @@ jobs:
             fi
           fi
 
-          COMMIT_LIST=$(git log --no-merges --format='- %s' "$BASE_REF".."${{ github.sha }}")
+          CHANGED_LIST=$(echo "$CHANGED" | sed 's/^/- /')
 
           REPO_URL="https://git.djeex.fr/Djeex/socat-proxy"
           SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
@@ -139,17 +138,15 @@ jobs:
 
           BODY=$(cat <<EOF
           ## Changelog
-          ---
 
           ### ${CATEGORY}
-          ---
           ${CHANGE_TITLE}
 
           **Source:** ${SOURCE_LINE}
           **Image:** \`${IMAGE}:${VERSION}\`
 
-          **Commits:**
-          ${COMMIT_LIST}
+          **Changed files:**
+          ${CHANGED_LIST}
           EOF
           )