diff --git a/devtools/etdump/tests/TARGETS b/devtools/etdump/tests/BUCK
similarity index 68%
rename from devtools/etdump/tests/TARGETS
rename to devtools/etdump/tests/BUCK
index 51e807891df..d038ad12002 100644
--- a/devtools/etdump/tests/TARGETS
+++ b/devtools/etdump/tests/BUCK
@@ -1,11 +1,12 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+fbcode_target(_kind = define_common_targets,)
 
-python_unittest(
+fbcode_target(_kind = python_unittest,
     name = "serialize_test",
     srcs = [
         "serialize_test.py",
diff --git a/devtools/inspector/TARGETS b/devtools/inspector/BUCK
similarity index 84%
rename from devtools/inspector/TARGETS
rename to devtools/inspector/BUCK
index db71623d208..f7b3740e26e 100644
--- a/devtools/inspector/TARGETS
+++ b/devtools/inspector/BUCK
@@ -1,8 +1,9 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 oncall("executorch")
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "inspector",
     srcs = [
         "_inspector.py",
@@ -22,7 +23,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_binary(
+fbcode_target(_kind = runtime.python_binary,
     name = "inspector_cli",
     main_function = ".inspector_cli.main",
     main_src = "inspector_cli.py",
@@ -32,7 +33,7 @@ runtime.python_binary(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "inspector_utils",
     srcs = [
         "_inspector_utils.py",
@@ -49,7 +50,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "intermediate_output_capturer",
     srcs = [
         "_intermediate_output_capturer.py",
@@ -59,7 +60,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "lib",
     srcs = ["__init__.py"],
     deps = [
diff --git a/devtools/inspector/numerical_comparator/TARGETS b/devtools/inspector/numerical_comparator/BUCK
similarity index 77%
rename from devtools/inspector/numerical_comparator/TARGETS
rename to devtools/inspector/numerical_comparator/BUCK
index eb2923d924d..2c55931e6fb 100644
--- a/devtools/inspector/numerical_comparator/TARGETS
+++ b/devtools/inspector/numerical_comparator/BUCK
@@ -1,15 +1,16 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 oncall("executorch")
 
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "numerical_comparator_base",
     srcs = ["numerical_comparator_base.py"],
     deps = [],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "l1_numerical_comparator",
     srcs = ["l1_numerical_comparator.py"],
     deps = [
@@ -18,7 +19,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "mse_numerical_comparator",
     srcs = ["mse_numerical_comparator.py"],
     deps = [
@@ -27,7 +28,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "snr_numerical_comparator",
     srcs = ["snr_numerical_comparator.py"],
     deps = [
@@ -36,7 +37,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "lib",
     srcs = ["__init__.py"],
     deps = [