diff --git a/extension/export_util/TARGETS b/extension/export_util/BUCK
similarity index 72%
rename from extension/export_util/TARGETS
rename to extension/export_util/BUCK
index 84670129bba..db93c140907 100644
--- a/extension/export_util/TARGETS
+++ b/extension/export_util/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 = "export_util",
     srcs = [
         "utils.py",
diff --git a/extension/flat_tensor/BUCK b/extension/flat_tensor/BUCK
index 08e83a5f3c4..7a4f253e8b9 100644
--- a/extension/flat_tensor/BUCK
+++ b/extension/flat_tensor/BUCK
@@ -1,6 +1,15 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/extension/flat_tensor/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/extension/flat_tensor/TARGETS b/extension/flat_tensor/TARGETS
deleted file mode 100644
index 08e83a5f3c4..00000000000
--- a/extension/flat_tensor/TARGETS
+++ /dev/null
@@ -1,6 +0,0 @@
-load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()