diff --git a/BUILD b/BUILD
index da734dde..e7cc8f58 100644
--- a/BUILD
+++ b/BUILD
@@ -53,7 +53,8 @@ cc_library(
         "@s2geometry",
         "@hnsw",
         # "@zip",
-        "@sentencepiece"
+        "@sentencepiece",
+        "@sentencepiece//:sentencepiece_headers"
     ],
 )
 
diff --git a/bazel/sentencepiece.BUILD b/bazel/sentencepiece.BUILD
index 75d0ba17..9476a073 100644
--- a/bazel/sentencepiece.BUILD
+++ b/bazel/sentencepiece.BUILD
@@ -9,6 +9,13 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
+cc_library(
+    name = "sentencepiece_headers",
+    hdrs = glob(["src/**/*.h"]),
+    includes = ["src"],
+    visibility = ["//visibility:public"],
+    strip_include_prefix = "src"
+)
 
 
 cmake(
@@ -23,7 +30,15 @@ cmake(
     install = False,
     cache_entries = {
         'SPM_USE_BUILTIN_PROTOBUF': 'OFF',
+        'Protobuf_LIBRARY': '$EXT_BUILD_ROOT/bazel-out/k8-fastbuild/bin/external/com_google_protobuf/',
+        'Protobuf_LITE_LIBRARY': '$EXT_BUILD_ROOT/bazel-out/k8-fastbuild/bin/external/com_google_protobuf/',
+        'Protobuf_INCLUDE_DIR': '$EXT_BUILD_ROOT/external/com_google_protobuf/src',
     },
+    deps = [
+        "@com_google_protobuf//:protobuf_lite",
+        "@com_google_protobuf//:protobuf",
+        "@com_google_protobuf//:protobuf_headers",
+    ],
     postfix_script= """
 echo "Intstalling sentencepiece"
 cp $BUILD_TMPDIR/src/libsentencepiece.a $INSTALLDIR/lib/libsentencepiece.a