diff --git a/backends/vulkan/test/custom_ops/BUCK b/backends/vulkan/test/custom_ops/BUCK
index 1e8cc179228..f559a6f1cfe 100644
--- a/backends/vulkan/test/custom_ops/BUCK
+++ b/backends/vulkan/test/custom_ops/BUCK
@@ -1,8 +1,9 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
+# targets.bzl.
 
+load("@fbsource//tools/build_defs:fbsource_utils.bzl", "is_fbcode")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+define_common_targets(is_fbcode = is_fbcode())
diff --git a/backends/vulkan/test/custom_ops/TARGETS b/backends/vulkan/test/custom_ops/TARGETS
deleted file mode 100644
index e84397dc20e..00000000000
--- a/backends/vulkan/test/custom_ops/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(is_fbcode = True)
diff --git a/backends/vulkan/test/op_tests/BUCK b/backends/vulkan/test/op_tests/BUCK
index 1e8cc179228..f559a6f1cfe 100644
--- a/backends/vulkan/test/op_tests/BUCK
+++ b/backends/vulkan/test/op_tests/BUCK
@@ -1,8 +1,9 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
+# targets.bzl.
 
+load("@fbsource//tools/build_defs:fbsource_utils.bzl", "is_fbcode")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+define_common_targets(is_fbcode = is_fbcode())
diff --git a/backends/vulkan/test/op_tests/TARGETS b/backends/vulkan/test/op_tests/TARGETS
deleted file mode 100644
index e84397dc20e..00000000000
--- a/backends/vulkan/test/op_tests/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(is_fbcode = True)
diff --git a/codegen/tools/BUCK b/codegen/tools/BUCK
index 1e8cc179228..f559a6f1cfe 100644
--- a/codegen/tools/BUCK
+++ b/codegen/tools/BUCK
@@ -1,8 +1,9 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
+# targets.bzl.
 
+load("@fbsource//tools/build_defs:fbsource_utils.bzl", "is_fbcode")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+define_common_targets(is_fbcode = is_fbcode())
diff --git a/codegen/tools/TARGETS b/codegen/tools/TARGETS
deleted file mode 100644
index e84397dc20e..00000000000
--- a/codegen/tools/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(is_fbcode = True)
diff --git a/extension/runner_util/test/BUCK b/extension/runner_util/test/BUCK
index 1e8cc179228..f559a6f1cfe 100644
--- a/extension/runner_util/test/BUCK
+++ b/extension/runner_util/test/BUCK
@@ -1,8 +1,9 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
+# targets.bzl.
 
+load("@fbsource//tools/build_defs:fbsource_utils.bzl", "is_fbcode")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+define_common_targets(is_fbcode = is_fbcode())
diff --git a/extension/runner_util/test/TARGETS b/extension/runner_util/test/TARGETS
deleted file mode 100644
index 7ace4add7f9..00000000000
--- a/extension/runner_util/test/TARGETS
+++ /dev/null
@@ -1,8 +0,0 @@
-# Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
-
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(is_fbcode = True)
diff --git a/kernels/optimized/BUCK b/kernels/optimized/BUCK
index 1e8cc179228..f559a6f1cfe 100644
--- a/kernels/optimized/BUCK
+++ b/kernels/optimized/BUCK
@@ -1,8 +1,9 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain xplat-only targets.
+# targets.bzl.
 
+load("@fbsource//tools/build_defs:fbsource_utils.bzl", "is_fbcode")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+define_common_targets(is_fbcode = is_fbcode())
diff --git a/kernels/optimized/TARGETS b/kernels/optimized/TARGETS
deleted file mode 100644
index beaebb81eeb..00000000000
--- a/kernels/optimized/TARGETS
+++ /dev/null
@@ -1,8 +0,0 @@
-# Any targets that should be shared between fbcode and xplat must be defined in
-# targets.bzl. This file can contain fbcode-only targets.
-
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets(True)