diff --git a/devtools/bundled_program/schema/BUCK b/devtools/bundled_program/schema/BUCK
index 1e8cc179228..84ac296c4e5 100644
--- a/devtools/bundled_program/schema/BUCK
+++ b/devtools/bundled_program/schema/BUCK
@@ -1,8 +1,35 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+oncall("executorch")
 # 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()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/devtools/bundled_program/schema/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+# Any targets that should be shared between fbcode and xplat must be defined in
+# targets.bzl. This file can contain fbcode-only targets.
+
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
+
+fbcode_target(_kind = runtime.python_library,
+    name = "bundled_program_schema_py",
+    srcs = [
+        "__init__.py",
+        "bundled_program_schema.py",
+    ],
+    visibility = [
+        "//executorch/devtools/bundled_program/...",
+        "//executorch/devtools/etrecord/...",
+    ],
+    deps = [
+        "//executorch/exir:scalar_type",
+    ],
+)
diff --git a/devtools/bundled_program/schema/TARGETS b/devtools/bundled_program/schema/TARGETS
deleted file mode 100644
index 51c004cbec0..00000000000
--- a/devtools/bundled_program/schema/TARGETS
+++ /dev/null
@@ -1,24 +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("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
-
-runtime.python_library(
-    name = "bundled_program_schema_py",
-    srcs = [
-        "__init__.py",
-        "bundled_program_schema.py",
-    ],
-    visibility = [
-        "//executorch/devtools/bundled_program/...",
-        "//executorch/devtools/etrecord/...",
-    ],
-    deps = [
-        "//executorch/exir:scalar_type",
-    ],
-)
diff --git a/devtools/etdump/data_sinks/tests/BUCK b/devtools/etdump/data_sinks/tests/BUCK
new file mode 100644
index 00000000000..f5029903c21
--- /dev/null
+++ b/devtools/etdump/data_sinks/tests/BUCK
@@ -0,0 +1,6 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load(":targets.bzl", "define_common_targets")
+
+oncall("executorch")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/devtools/etdump/data_sinks/tests/TARGETS b/devtools/etdump/data_sinks/tests/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/devtools/etdump/data_sinks/tests/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()