diff --git a/.github/workflows/comment-evolution-plot.yml b/.github/workflows/comment-evolution-plot.yml
index ed7208168..1f996ee9c 100644
--- a/.github/workflows/comment-evolution-plot.yml
+++ b/.github/workflows/comment-evolution-plot.yml
@@ -62,37 +62,36 @@ jobs:
 
       - name: Unpack evolution plot artifact
         run: |
+          set -e
           mkdir -p evolution-plot
           unzip -o evolution-plot.zip -d evolution-plot
           test -f "evolution-plot/${ARTIFACT_NAME}"
 
-      - name: Create report with evolution plot
+      - name: Post PR comment
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
           HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
           RUN_ID: ${{ github.event.workflow_run.id }}
         run: |
-          echo "## ✅ COMPAS Build Successful!" >> report.md
-          echo "" >> report.md
-          echo "| Item | Value |" >> report.md
-          echo "|------|-------|" >> report.md
-          echo "| **Commit** | [\`$(echo "$HEAD_SHA" | cut -c1-7)\`](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${HEAD_SHA}) |" >> report.md
-          echo "| **Logs** | [View workflow](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}) |" >> report.md
-          echo "" >> report.md
-
-          if [ -f "evolution-plot/${ARTIFACT_NAME}" ]; then
-            echo "### Detailed Evolution Plot" >> report.md
-            echo "<details><summary>Click to view evolution plot</summary>" >> report.md
-            echo "" >> report.md
-            echo "![](./evolution-plot/${ARTIFACT_NAME})" >> report.md
-            echo "</details>" >> report.md
-          else
-            echo "### ⚠️ Evolution plot not found" >> report.md
-          fi
-
-          echo "" >> report.md
-          echo "---" >> report.md
-          echo "<sub>Generated by COMPAS CI </sub>" >> report.md
-
-          npx -y @dvcorg/cml comment create --pr "$PR_NUMBER" report.md
+          set -e
+
+          cat <<EOF > report.md
+          ## ✅ COMPAS Build Successful!
+
+          | Item | Value |
+          |------|-------|
+          | **Commit** | [\`$(echo "$HEAD_SHA" | cut -c1-7)\`]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$HEAD_SHA) |
+          | **Logs** | [View workflow]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$RUN_ID) |
+
+          ### Detailed Evolution Plot
+          <details><summary>Click to view evolution plot</summary>
+
+          ![](./evolution-plot/${ARTIFACT_NAME})
+          </details>
+
+          ---
+          <sub>Generated by COMPAS CI</sub>
+          EOF
+
+          npx -y @dvcorg/cml@0.20.6 comment create --target=pr/"$PR_NUMBER" report.md