diff --git a/bin/comment_with_manifest_diff b/bin/comment_with_manifest_diff
index 6da98bf..c473de8 100755
--- a/bin/comment_with_manifest_diff
+++ b/bin/comment_with_manifest_diff
@@ -44,7 +44,7 @@ if [ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]; then
   exit 2
 fi
 
-DIFF_MANIFEST_FOLDER="./build/reports/diff_manifest"
+DIFF_MANIFEST_FOLDER="./build/reports/diff_manifest/${MODULE}/${BUILD_VARIANT}"
 TRUNK_MANIFEST_FILE="$DIFF_MANIFEST_FOLDER/trunk_AndroidManifest.txt"
 PR_MANIFEST_FILE="$DIFF_MANIFEST_FOLDER/pr_AndroidManifest.txt"
 DIFF_MANIFEST_FILE="$DIFF_MANIFEST_FOLDER/diff_manifest.txt"
@@ -101,7 +101,7 @@ if [ -n "$DIFF_MANIFEST_FILE" ]; then
     append_content "## Project manifest changes" "$(generate_manifest_comment_body)"
   fi
 
-  comment_on_pr --id "manifest-diff" --if-exist update "$COMMENT_FILE"
+  comment_on_pr --id "manifest-diff-${MODULE}-${BUILD_VARIANT}" --if-exist update "$COMMENT_FILE"
 else
-  comment_on_pr --id "manifest-diff" --if-exist delete
+  comment_on_pr --id "manifest-diff-${MODULE}-${BUILD_VARIANT}" --if-exist delete
 fi