diff --git a/enterprise/server/cmd/server/yaml_doc/BUILD b/enterprise/server/cmd/server/yaml_doc/BUILD
index f5d87cf703d2..4e9d52e1ed60 100644
--- a/enterprise/server/cmd/server/yaml_doc/BUILD
+++ b/enterprise/server/cmd/server/yaml_doc/BUILD
@@ -1,10 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 # gazelle:default_visibility //enterprise:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "@buildbuddy_internal//:__subpackages__",
-])
+package(default_visibility = ["//enterprise:__subpackages__"])
 
 go_binary(
     name = "yaml_doc",
diff --git a/enterprise/server/remote_execution/runner/testworker/BUILD b/enterprise/server/remote_execution/runner/testworker/BUILD
index f6fd559ea7ce..e58e73e14bb9 100644
--- a/enterprise/server/remote_execution/runner/testworker/BUILD
+++ b/enterprise/server/remote_execution/runner/testworker/BUILD
@@ -1,10 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 # gazelle:default_visibility //enterprise/server/remote_execution/runner:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "//enterprise/server/remote_execution/runner:__subpackages__",
-])
+package(default_visibility = ["//enterprise/server/remote_execution/runner:__subpackages__"])
 
 go_library(
     name = "testworker_lib",
diff --git a/enterprise/server/test/integration/remote_execution/proto/BUILD b/enterprise/server/test/integration/remote_execution/proto/BUILD
index 38f06271dd7e..5f23c827d94a 100644
--- a/enterprise/server/test/integration/remote_execution/proto/BUILD
+++ b/enterprise/server/test/integration/remote_execution/proto/BUILD
@@ -1,12 +1,8 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
-# TODO(sluongng): ensure all //enterprise code are not dependency of FOSS code
 # gazelle:default_visibility //enterprise/server/test/integration/remote_execution:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "//enterprise/server/test/integration/remote_execution:__subpackages__",
-])
+package(default_visibility = ["//enterprise/server/test/integration/remote_execution:__subpackages__"])
 
 proto_library(
     name = "remoteexecutiontest_proto",
diff --git a/enterprise/server/webhooks/bitbucket/test_data/BUILD b/enterprise/server/webhooks/bitbucket/test_data/BUILD
index c863c6da60d9..b324f53e6d21 100644
--- a/enterprise/server/webhooks/bitbucket/test_data/BUILD
+++ b/enterprise/server/webhooks/bitbucket/test_data/BUILD
@@ -1,10 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 # gazelle:default_visibility //enterprise/server/webhooks/bitbucket:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "//enterprise/server/webhooks/bitbucket:__subpackages__",
-])
+package(default_visibility = ["//enterprise/server/webhooks/bitbucket:__subpackages__"])
 
 go_library(
     name = "test_data",
diff --git a/enterprise/server/webhooks/github/test_data/BUILD b/enterprise/server/webhooks/github/test_data/BUILD
index 0439452d14e3..9777c3449ebe 100644
--- a/enterprise/server/webhooks/github/test_data/BUILD
+++ b/enterprise/server/webhooks/github/test_data/BUILD
@@ -1,10 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 # gazelle:default_visibility //enterprise/server/webhooks/github:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "//enterprise/server/webhooks/github:__subpackages__",
-])
+package(default_visibility = ["//enterprise/server/webhooks/github:__subpackages__"])
 
 go_library(
     name = "test_data",
diff --git a/enterprise/server/workflow/config/test_data/BUILD b/enterprise/server/workflow/config/test_data/BUILD
index 062302a56270..6e196bb4c40b 100644
--- a/enterprise/server/workflow/config/test_data/BUILD
+++ b/enterprise/server/workflow/config/test_data/BUILD
@@ -1,10 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 # gazelle:default_visibility //enterprise/server/workflow/config:__subpackages__
-package(default_visibility = [
-    "//enterprise:__subpackages__",
-    "//enterprise/server/workflow/config:__subpackages__",
-])
+package(default_visibility = ["//enterprise/server/workflow/config:__subpackages__"])
 
 go_library(
     name = "test_data",