diff --git a/distribution/build_and_upload_gcp_artifacts.sh b/distribution/build_and_upload_gcp_artifacts.sh
index 9e27a86991..0c9ccda7ed 100755
--- a/distribution/build_and_upload_gcp_artifacts.sh
+++ b/distribution/build_and_upload_gcp_artifacts.sh
@@ -42,11 +42,11 @@ sbt clean
 sbt flink/assembly
 sbt service/assembly
 
-bazel build //cloud_gcp:lib_deploy.jar
-bazel build //cloud_gcp:submitter_deploy.jar
+bazel build //cloud_gcp:cloud_gcp_lib_deploy.jar
+bazel build //cloud_gcp:cloud_gcp_submitter_deploy.jar
 
-CLOUD_GCP_JAR="$CHRONON_ROOT_DIR/bazel-bin/cloud_gcp/lib_deploy.jar"
-CLOUD_GCP_SUBMITTER_JAR="$CHRONON_ROOT_DIR/bazel-bin/cloud_gcp/submitter_deploy.jar"
+CLOUD_GCP_JAR="$CHRONON_ROOT_DIR/bazel-bin/cloud_gcp/cloud_gcp_lib_deploy.jar"
+CLOUD_GCP_SUBMITTER_JAR="$CHRONON_ROOT_DIR/bazel-bin/cloud_gcp/cloud_gcp_submitter_deploy.jar"
 FLINK_JAR="$CHRONON_ROOT_DIR/flink/target/scala-2.12/flink-assembly-0.1.0-SNAPSHOT.jar"
 SERVICE_JAR="$CHRONON_ROOT_DIR/service/target/scala-2.12/service-0.1.0-SNAPSHOT.jar"
 
diff --git a/tools/build_rules/thrift/thrift.bzl b/tools/build_rules/thrift/thrift.bzl
index 6cad612582..3c99d3392e 100644
--- a/tools/build_rules/thrift/thrift.bzl
+++ b/tools/build_rules/thrift/thrift.bzl
@@ -106,6 +106,7 @@ def thrift_java_library(name, srcs, **kwargs):
         name = name,
         srcs = srcs,
         thrift_binary = select({
+            "@platforms//os:macos": "/opt/homebrew/bin/thrift",
             "//conditions:default": "/usr/local/bin/thrift",
         }),
         **kwargs