diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index eeec035..fed8c19 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -64,7 +64,7 @@ jobs:
         with:
           token: ${{ github.token }}
           issue: ${{ github.event.number }}
-          body: ":x: @${{github.actor}} bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})."
-          bot_body: ":x: Bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})."
+          body: "@${{github.actor}} bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})."
+          bot_body: "Bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})."
           bot: BrewTestBot
   
\ No newline at end of file
diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb
index a70160e..522fb26 100644
--- a/Formula/risingwave.rb
+++ b/Formula/risingwave.rb
@@ -23,7 +23,13 @@ def install
     ENV.cxx11
 
     ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703
-    ENV.append "RUSTFLAGS", ""
+    # Homebrew changes cxx flags, and CMake doesn't pick them up, so rdkafka-sys build fails.
+    # We cannot pass CMake flags (`std_cmake_args`) because it's in their build.rs.
+    #
+    # Some refs that might be useful:
+    # https://github.com/Homebrew/homebrew-core/pull/51949#issuecomment-601943075
+    # https://github.com/Homebrew/brew/pull/7134
+    ENV["SDKROOT"] = MacOS.sdk_path_if_needed
     system "cargo", "install",
            "--bin", "risingwave",
            "--features", "rw-static-link",