diff --git a/kernels/portable/cpu/util/test/BUCK b/kernels/portable/cpu/util/test/BUCK
index 1e8cc179228..822bd32db6d 100644
--- a/kernels/portable/cpu/util/test/BUCK
+++ b/kernels/portable/cpu/util/test/BUCK
@@ -1,8 +1,19 @@
+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/kernels/portable/cpu/util/test/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(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/kernels/portable/cpu/util/test/TARGETS b/kernels/portable/cpu/util/test/TARGETS
deleted file mode 100644
index 2341af9282f..00000000000
--- a/kernels/portable/cpu/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 fbcode-only targets.
-
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/kernels/portable/test/BUCK b/kernels/portable/test/BUCK
index 1e8cc179228..4c16c92e4c4 100644
--- a/kernels/portable/test/BUCK
+++ b/kernels/portable/test/BUCK
@@ -1,8 +1,39 @@
+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/kernels/portable/test/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(":targets.bzl", "define_common_targets")
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+
+
+fbcode_target(_kind = define_common_targets,)
+
+fbcode_target(_kind = runtime.cxx_library,
+    name = "aot_ops_test_lib",
+    srcs = [
+        "register_ops_aot_for_test.cpp",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//executorch/extension/aten_util:aten_bridge",
+        "//executorch/kernels/portable/cpu:op_grid_sampler_2d",
+        "//executorch/kernels/portable/cpu:op_upsample_bilinear2d",
+        "//executorch/kernels/portable/cpu:op_upsample_bilinear2d_aa",
+        "//executorch/kernels/portable/cpu:op_upsample_nearest2d",
+        "//executorch/runtime/core/exec_aten:lib",
+    ],
+    external_deps = [
+        "libtorch",
+    ],
+)
diff --git a/kernels/portable/test/TARGETS b/kernels/portable/test/TARGETS
deleted file mode 100644
index 44c5697729e..00000000000
--- a/kernels/portable/test/TARGETS
+++ /dev/null
@@ -1,28 +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")
-load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
-
-oncall("executorch")
-
-define_common_targets()
-
-runtime.cxx_library(
-    name = "aot_ops_test_lib",
-    srcs = [
-        "register_ops_aot_for_test.cpp",
-    ],
-    visibility = ["PUBLIC"],
-    deps = [
-        "//executorch/extension/aten_util:aten_bridge",
-        "//executorch/kernels/portable/cpu:op_grid_sampler_2d",
-        "//executorch/kernels/portable/cpu:op_upsample_bilinear2d",
-        "//executorch/kernels/portable/cpu:op_upsample_bilinear2d_aa",
-        "//executorch/kernels/portable/cpu:op_upsample_nearest2d",
-        "//executorch/runtime/core/exec_aten:lib",
-    ],
-    external_deps = [
-        "libtorch",
-    ],
-)
diff --git a/kernels/prim_ops/BUCK b/kernels/prim_ops/BUCK
index 1e8cc179228..e843bab9a00 100644
--- a/kernels/prim_ops/BUCK
+++ b/kernels/prim_ops/BUCK
@@ -1,8 +1,18 @@
+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/kernels/prim_ops/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(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/kernels/prim_ops/TARGETS b/kernels/prim_ops/TARGETS
deleted file mode 100644
index 77b38349334..00000000000
--- a/kernels/prim_ops/TARGETS
+++ /dev/null
@@ -1,7 +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()
diff --git a/runtime/TARGETS b/runtime/BUCK
similarity index 63%
rename from runtime/TARGETS
rename to runtime/BUCK
index 9f8f1b9783a..bbedc422542 100644
--- a/runtime/TARGETS
+++ b/runtime/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 = "runtime",
     srcs = ["__init__.py"],
     deps = [