diff --git a/.bazelrc b/.bazelrc
index bad3acd..0d03563 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -45,8 +45,12 @@ build:macos --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 
-# Config to disable sframe in assembler to avoid linker errors with gcc 15
+# Config to disable sframe unwind tables to avoid assembler/linker errors with gcc 15
 build:sframe_fix --copt=-Wa,--gsframe=no
+build:sframe_fix --cxxopt=-Wa,--gsframe=no
+build:sframe_fix --host_copt=-Wa,--gsframe=no
+build:sframe_fix --host_cxxopt=-Wa,--gsframe=no
+build:linux --config=sframe_fix
 
 build:macos --macos_minimum_os=10.12
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 834e78c..2cc1a93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,6 +65,7 @@ jobs:
 
   docker-serving-build:
     name: Build Docker Serving Image
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4