diff --git a/extension/threadpool/test/BUCK b/extension/threadpool/test/BUCK
index 1e8cc179228..f80c5a3fa8e 100644
--- a/extension/threadpool/test/BUCK
+++ b/extension/threadpool/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/extension/threadpool/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/extension/training/BUCK b/extension/training/BUCK
index 1e8cc179228..f343cd542b9 100644
--- a/extension/training/BUCK
+++ b/extension/training/BUCK
@@ -1,8 +1,31 @@
+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/extension/training/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 = "lib",
+    srcs = [
+        "__init__.py",
+    ],
+    deps = [
+        "//executorch/extension/training/pybindings:_training_lib",
+        "//executorch/extension/training/pybindings:_training_module",
+    ],
+)
diff --git a/extension/training/TARGETS b/extension/training/TARGETS
deleted file mode 100644
index eeed302c339..00000000000
--- a/extension/training/TARGETS
+++ /dev/null
@@ -1,20 +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 = "lib",
-    srcs = [
-        "__init__.py",
-    ],
-    deps = [
-        "//executorch/extension/training/pybindings:_training_lib",
-        "//executorch/extension/training/pybindings:_training_module",
-    ],
-)
diff --git a/extension/threadpool/test/TARGETS b/extension/training/examples/CIFAR/BUCK
similarity index 59%
rename from extension/threadpool/test/TARGETS
rename to extension/training/examples/CIFAR/BUCK
index 2341af9282f..f488cf7ec94 100644
--- a/extension/threadpool/test/TARGETS
+++ b/extension/training/examples/CIFAR/BUCK
@@ -1,3 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 # Any targets that should be shared between fbcode and xplat must be defined in
 # targets.bzl. This file can contain fbcode-only targets.
 
@@ -5,4 +6,4 @@ load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+fbcode_target(_kind = define_common_targets,)
diff --git a/extension/training/examples/CIFAR/TARGETS b/extension/training/examples/CIFAR/TARGETS
deleted file mode 100644
index 2341af9282f..00000000000
--- a/extension/training/examples/CIFAR/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()