diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 095598a..7dd6a44 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -81,8 +81,8 @@ jobs:
 
           MARKER="<!-- citron-pr-builds:${PR_NUMBER} -->"
           COMMENT_BODY=$(gh api "repos/${UPSTREAM}/issues/${PR_NUMBER}/comments?per_page=100" \
-            --jq ".[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\")) | .body" \
-            2>/dev/null | tail -n 1 || echo "")
+            --jq "[.[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\"))] | last | .body // empty" \
+            2>/dev/null || echo "")
 
           if [ -z "$COMMENT_BODY" ]; then
             echo "No master comment found, will build."
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index bfb50c4..86a8ceb 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -81,8 +81,8 @@ jobs:
 
           MARKER="<!-- citron-pr-builds:${PR_NUMBER} -->"
           COMMENT_BODY=$(gh api "repos/${UPSTREAM}/issues/${PR_NUMBER}/comments?per_page=100" \
-            --jq ".[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\")) | .body" \
-            2>/dev/null | tail -n 1 || echo "")
+            --jq "[.[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\"))] | last | .body // empty" \
+            2>/dev/null || echo "")
 
           if [ -z "$COMMENT_BODY" ]; then
             echo "No master comment found, will build."
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 96815e5..ac1a205 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -81,8 +81,8 @@ jobs:
 
           MARKER="<!-- citron-pr-builds:${PR_NUMBER} -->"
           COMMENT_BODY=$(gh api "repos/${UPSTREAM}/issues/${PR_NUMBER}/comments?per_page=100" \
-            --jq ".[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\")) | .body" \
-            2>/dev/null | tail -n 1 || echo "")
+            --jq "[.[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\"))] | last | .body // empty" \
+            2>/dev/null || echo "")
 
           if [ -z "$COMMENT_BODY" ]; then
             echo "No master comment found, will build."
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 28a8d8c..b26d980 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -81,8 +81,8 @@ jobs:
 
           MARKER="<!-- citron-pr-builds:${PR_NUMBER} -->"
           COMMENT_BODY=$(gh api "repos/${UPSTREAM}/issues/${PR_NUMBER}/comments?per_page=100" \
-            --jq ".[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\")) | .body" \
-            2>/dev/null | tail -n 1 || echo "")
+            --jq "[.[] | select(.body | contains(\"$MARKER\") or contains(\"Build Artifacts for PR #${PR_NUMBER}\"))] | last | .body // empty" \
+            2>/dev/null || echo "")
 
           if [ -z "$COMMENT_BODY" ]; then
             echo "No master comment found, will build."