diff --git a/BUILD b/BUILD
index 66a4f700..0733ba1d 100644
--- a/BUILD
+++ b/BUILD
@@ -22,7 +22,7 @@ npm_link_all_packages(name = "node_modules")
 exports_files(["tsconfig.json"])
 
 # gazelle:prefix go.resf.org/peridot
-# gazelle:build_file_name BUILD
+# gazelle:build_file_name BUILD,BUILD.bazel
 # gazelle:go_visibility //third_party:__subpackages__
 # gazelle:exclude third_party/googleapis
 # gazelle:exclude vendor/go.resf.org/peridot
diff --git a/base/ci/BUILD b/base/ci/BUILD
index ae65b6eb..a17d19be 100644
--- a/base/ci/BUILD
+++ b/base/ci/BUILD
@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
diff --git a/devtools/devtemporal/BUILD.bazel b/devtools/devtemporal/BUILD
similarity index 100%
rename from devtools/devtemporal/BUILD.bazel
rename to devtools/devtemporal/BUILD
diff --git a/scripts/govendor b/scripts/govendor
index 608baad7..223b8efc 100755
--- a/scripts/govendor
+++ b/scripts/govendor
@@ -5,5 +5,11 @@ go mod tidy -e
 go mod vendor -e
 find vendor -name "BUILD.bazel" -delete
 find vendor -name "BUILD" -delete
+
+# if the vendor package has a build/BUILD directory/file, then force BUILD.bazel
+for d in $(find vendor -iname build); do
+  echo '' > $(dirname $d)/BUILD.bazel
+done
+
 bazel run //:gazelle
 bazel run //:gazelle-update-repos
diff --git a/tools/build_rules/BUILD b/tools/build_rules/BUILD
index ae65b6eb..a17d19be 100644
--- a/tools/build_rules/BUILD
+++ b/tools/build_rules/BUILD
@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
diff --git a/tools/build_rules/ui_bundle/BUILD b/tools/build_rules/ui_bundle/BUILD
index ae65b6eb..a17d19be 100644
--- a/tools/build_rules/ui_bundle/BUILD
+++ b/tools/build_rules/ui_bundle/BUILD
@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
diff --git a/vendor/go.temporal.io/server/common/BUILD.bazel b/vendor/go.temporal.io/server/common/BUILD.bazel
new file mode 100644
index 00000000..f1659646
--- /dev/null
+++ b/vendor/go.temporal.io/server/common/BUILD.bazel
@@ -0,0 +1,41 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "common",
+    srcs = [
+        "clientCache.go",
+        "constants.go",
+        "daemon.go",
+        "defaultRetrySettings.go",
+        "protoTaskTokenSerializer.go",
+        "rpc.go",
+        "taskTokenSerializerInterfaces.go",
+        "util.go",
+    ],
+    importmap = "go.resf.org/peridot/vendor/go.temporal.io/server/common",
+    importpath = "go.temporal.io/server/common",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//vendor/github.com/dgryski/go-farm",
+        "//vendor/github.com/gogo/protobuf/proto",
+        "//vendor/go.temporal.io/api/common/v1:common",
+        "//vendor/go.temporal.io/api/enums/v1:enums",
+        "//vendor/go.temporal.io/api/history/v1:history",
+        "//vendor/go.temporal.io/api/serviceerror",
+        "//vendor/go.temporal.io/api/workflowservice/v1:workflowservice",
+        "//vendor/go.temporal.io/server/api/historyservice/v1:historyservice",
+        "//vendor/go.temporal.io/server/api/matchingservice/v1:matchingservice",
+        "//vendor/go.temporal.io/server/api/token/v1:token",
+        "//vendor/go.temporal.io/server/api/workflow/v1:workflow",
+        "//vendor/go.temporal.io/server/common/backoff",
+        "//vendor/go.temporal.io/server/common/dynamicconfig",
+        "//vendor/go.temporal.io/server/common/log",
+        "//vendor/go.temporal.io/server/common/log/tag",
+        "//vendor/go.temporal.io/server/common/metrics",
+        "//vendor/go.temporal.io/server/common/number",
+        "//vendor/go.temporal.io/server/common/primitives/timestamp",
+        "//vendor/go.temporal.io/server/common/serviceerror",
+        "//vendor/go.temporal.io/server/common/util",
+        "@org_golang_google_grpc//:go_default_library",
+    ],
+)