diff --git a/backends/cuda/runtime/TARGETS b/backends/cuda/runtime/BUCK
similarity index 89%
rename from backends/cuda/runtime/TARGETS
rename to backends/cuda/runtime/BUCK
index 532ab5544ab..6133bf82d64 100644
--- a/backends/cuda/runtime/TARGETS
+++ b/backends/cuda/runtime/BUCK
@@ -1,9 +1,10 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
-load("//tools/build/buck:nvcc_flags.bzl", "get_nvcc_arch_args")
+load("@fbcode//tools/build/buck:nvcc_flags.bzl", "get_nvcc_arch_args")
 
 oncall("executorch")
 
-runtime.cxx_library(
+fbcode_target(_kind = runtime.cxx_library,
     name = "cuda_platform",
     srcs = [
         "platform/platform.cpp",
@@ -27,7 +28,7 @@ runtime.cxx_library(
     ],
 )
 
-runtime.cxx_library(
+fbcode_target(_kind = runtime.cxx_library,
     name = "tensor_maker",
     srcs = [
         "tensor/tensor_maker.cpp",
@@ -46,7 +47,7 @@ runtime.cxx_library(
     ],
 )
 
-runtime.cxx_library(
+fbcode_target(_kind = runtime.cxx_library,
     name = "runtime_shims",
     srcs = [
         "guard.cpp",
@@ -87,7 +88,7 @@ runtime.cxx_library(
     ],
 )
 
-runtime.cxx_library(
+fbcode_target(_kind = runtime.cxx_library,
     name = "cuda_backend",
     srcs = [
         "cuda_backend.cpp",
diff --git a/backends/cuda/runtime/shims/tests/BUCK b/backends/cuda/runtime/shims/tests/BUCK
new file mode 100644
index 00000000000..e1f13b4db7f
--- /dev/null
+++ b/backends/cuda/runtime/shims/tests/BUCK
@@ -0,0 +1,7 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
+load(":targets.bzl", "define_common_targets")
+
+oncall("executorch")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/cuda/runtime/shims/tests/TARGETS b/backends/cuda/runtime/shims/tests/TARGETS
deleted file mode 100644
index 9ff3e83a8bd..00000000000
--- a/backends/cuda/runtime/shims/tests/TARGETS
+++ /dev/null
@@ -1,6 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/cuda/runtime/tests/BUCK b/backends/cuda/runtime/tests/BUCK
new file mode 100644
index 00000000000..e1f13b4db7f
--- /dev/null
+++ b/backends/cuda/runtime/tests/BUCK
@@ -0,0 +1,7 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
+load(":targets.bzl", "define_common_targets")
+
+oncall("executorch")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/cuda/runtime/tests/TARGETS b/backends/cuda/runtime/tests/TARGETS
deleted file mode 100644
index 9ff3e83a8bd..00000000000
--- a/backends/cuda/runtime/tests/TARGETS
+++ /dev/null
@@ -1,6 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/cuda/tests/TARGETS b/backends/cuda/tests/BUCK
similarity index 86%
rename from backends/cuda/tests/TARGETS
rename to backends/cuda/tests/BUCK
index 974086cd4c5..79d5841fb72 100644
--- a/backends/cuda/tests/TARGETS
+++ b/backends/cuda/tests/BUCK
@@ -1,10 +1,11 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 load("@fbcode_macros//build_defs:python_unittest_remote_gpu.bzl", "python_unittest_remote_gpu")
 
 oncall("executorch")
 
-python_unittest_remote_gpu(
+fbcode_target(_kind = python_unittest_remote_gpu,
     name = "test_cuda_export",
     srcs = [
         "test_cuda_export.py",
@@ -24,7 +25,7 @@ python_unittest_remote_gpu(
     keep_gpu_sections = True,
 )
 
-python_unittest(
+fbcode_target(_kind = python_unittest,
     name = "test_cuda_partitioner",
     srcs = [
         "test_cuda_partitioner.py",
diff --git a/backends/example/TARGETS b/backends/example/BUCK
similarity index 85%
rename from backends/example/TARGETS
rename to backends/example/BUCK
index 48fb971428b..d1f474f54e8 100644
--- a/backends/example/TARGETS
+++ b/backends/example/BUCK
@@ -1,9 +1,10 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 
 oncall("executorch")
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "example_quantizer",
     srcs = [
         "example_quantizer.py",
@@ -15,7 +16,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "example_backend",
     srcs = [
         "example_backend.py",
@@ -27,7 +28,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "example_partitioner",
     srcs = [
         "example_partitioner.py",
@@ -43,7 +44,7 @@ runtime.python_library(
     ],
 )
 
-python_unittest(
+fbcode_target(_kind = python_unittest,
     name = "test_example_delegate",
     srcs = [
         "test_example_delegate.py",
diff --git a/backends/example/example_backend_delegate_passes/TARGETS b/backends/example/example_backend_delegate_passes/BUCK
similarity index 76%
rename from backends/example/example_backend_delegate_passes/TARGETS
rename to backends/example/example_backend_delegate_passes/BUCK
index 9e3b06486a8..49d4b985497 100644
--- a/backends/example/example_backend_delegate_passes/TARGETS
+++ b/backends/example/example_backend_delegate_passes/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 = "lib",
     srcs = [
         "merge_to_dim_pass.py",
diff --git a/backends/example/example_operators/TARGETS b/backends/example/example_operators/BUCK
similarity index 74%
rename from backends/example/example_operators/TARGETS
rename to backends/example/example_operators/BUCK
index 70f8f3cc0c5..50061f819c2 100644
--- a/backends/example/example_operators/TARGETS
+++ b/backends/example/example_operators/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 = "example_operators_lib",
     srcs = [
         "adaptive_avg_pool2d.py",
diff --git a/backends/nxp/TARGETS b/backends/nxp/BUCK
similarity index 83%
rename from backends/nxp/TARGETS
rename to backends/nxp/BUCK
index a5a0508b33c..ab22cc35466 100644
--- a/backends/nxp/TARGETS
+++ b/backends/nxp/BUCK
@@ -1,3 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_pytest.bzl", "python_pytest")
 load(
@@ -8,7 +9,7 @@ load(
 oncall("executorch")
 
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "aten_passes",
     srcs = glob([
         "aten_passes/*.py",
@@ -19,7 +20,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "edge_passes",
     srcs = glob([
         "edge_passes/*.py",
@@ -32,7 +33,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "_passes",
     srcs = glob([
         "_passes/*.py",
@@ -44,7 +45,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "quantizer",
     srcs = [
         "quantizer/neutron_quantizer.py",
@@ -58,7 +59,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "neutron_sdk",
     srcs = glob(["backend/**/*.py"]),
     deps = [
@@ -66,7 +67,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "neutron_backend",
     srcs = [
         "nxp_backend.py",
diff --git a/backends/nxp/runtime/BUCK b/backends/nxp/runtime/BUCK
index f91c46c0f20..d90dc36cee9 100644
--- a/backends/nxp/runtime/BUCK
+++ b/backends/nxp/runtime/BUCK
@@ -1,5 +1,13 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/backends/nxp/runtime/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load("targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/nxp/runtime/TARGETS b/backends/nxp/runtime/TARGETS
deleted file mode 100644
index f91c46c0f20..00000000000
--- a/backends/nxp/runtime/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load("targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/nxp/tests/TARGETS b/backends/nxp/tests/BUCK
similarity index 80%
rename from backends/nxp/tests/TARGETS
rename to backends/nxp/tests/BUCK
index f492111aff2..24da34357db 100644
--- a/backends/nxp/tests/TARGETS
+++ b/backends/nxp/tests/BUCK
@@ -1,9 +1,10 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_pytest.bzl", "python_pytest")
 
 oncall("executorch")
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "models",
     srcs = [
         "models.py",
@@ -13,7 +14,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "executorch_pipeline",
     srcs = [
         "executorch_pipeline.py",
@@ -29,7 +30,7 @@ runtime.python_library(
     ]
 )
 
-python_pytest(
+fbcode_target(_kind = python_pytest,
     name = "test_quantizer",
     srcs = [
         "test_quantizer.py",
@@ -41,7 +42,7 @@ python_pytest(
     ],
 )
 
-python_pytest(
+fbcode_target(_kind = python_pytest,
     name = "test_neutron_backend",
     srcs = [
         "test_neutron_backend.py",
diff --git a/backends/qualcomm/BUCK b/backends/qualcomm/BUCK
index 1e8cc179228..38104c2c84a 100644
--- a/backends/qualcomm/BUCK
+++ b/backends/qualcomm/BUCK
@@ -1,8 +1,26 @@
+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/backends/qualcomm/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,)
+
+fbcode_target(_kind = runtime.python_library,
+    name = "preprocess",
+    srcs = ["qnn_preprocess.py"],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//executorch/backends/qualcomm/_passes:passes",
+    ],
+)
diff --git a/backends/qualcomm/TARGETS b/backends/qualcomm/TARGETS
deleted file mode 100644
index 747930e8e84..00000000000
--- a/backends/qualcomm/TARGETS
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
-
-runtime.python_library(
-    name = "preprocess",
-    srcs = ["qnn_preprocess.py"],
-    visibility = ["PUBLIC"],
-    deps = [
-        "//executorch/backends/qualcomm/_passes:passes",
-    ],
-)
diff --git a/backends/qualcomm/_passes/TARGETS b/backends/qualcomm/_passes/BUCK
similarity index 77%
rename from backends/qualcomm/_passes/TARGETS
rename to backends/qualcomm/_passes/BUCK
index eaea7236c93..3af527a2d79 100644
--- a/backends/qualcomm/_passes/TARGETS
+++ b/backends/qualcomm/_passes/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 = "passes",
     srcs = glob([
         "*.py",
diff --git a/backends/qualcomm/aot/python/BUCK b/backends/qualcomm/aot/python/BUCK
index 0a42614a385..5b6d63a12a8 100644
--- a/backends/qualcomm/aot/python/BUCK
+++ b/backends/qualcomm/aot/python/BUCK
@@ -1,5 +1,13 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/backends/qualcomm/aot/python/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/qualcomm/aot/python/TARGETS b/backends/qualcomm/aot/python/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/aot/python/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/aot/wrappers/BUCK b/backends/qualcomm/aot/wrappers/BUCK
index 1e8cc179228..2d908d26fe8 100644
--- a/backends/qualcomm/aot/wrappers/BUCK
+++ b/backends/qualcomm/aot/wrappers/BUCK
@@ -1,8 +1,16 @@
+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/backends/qualcomm/aot/wrappers/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/qualcomm/aot/wrappers/TARGETS b/backends/qualcomm/aot/wrappers/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/aot/wrappers/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/builders/BUCK b/backends/qualcomm/builders/BUCK
index 0a42614a385..e44c1bd8517 100644
--- a/backends/qualcomm/builders/BUCK
+++ b/backends/qualcomm/builders/BUCK
@@ -1,5 +1,13 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-define_common_targets()
+non_fbcode_target(_kind = define_common_targets,)
+
+# !!!! fbcode/executorch/backends/qualcomm/builders/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/qualcomm/builders/TARGETS b/backends/qualcomm/builders/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/builders/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/debugger/TARGETS b/backends/qualcomm/debugger/BUCK
similarity index 81%
rename from backends/qualcomm/debugger/TARGETS
rename to backends/qualcomm/debugger/BUCK
index 6a7732231fc..c86f0756d67 100644
--- a/backends/qualcomm/debugger/TARGETS
+++ b/backends/qualcomm/debugger/BUCK
@@ -1,6 +1,7 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "utils",
     srcs = ["utils.py"],
     deps = [
@@ -11,7 +12,7 @@ runtime.python_library(
     ]
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "qnn_intermediate_debugger",
     srcs = [
         "format_outputs.py",
diff --git a/backends/qualcomm/partition/BUCK b/backends/qualcomm/partition/BUCK
new file mode 100644
index 00000000000..f5029903c21
--- /dev/null
+++ b/backends/qualcomm/partition/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/backends/qualcomm/partition/TARGETS b/backends/qualcomm/partition/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/partition/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/quantizer/BUCK b/backends/qualcomm/quantizer/BUCK
new file mode 100644
index 00000000000..f5029903c21
--- /dev/null
+++ b/backends/qualcomm/quantizer/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/backends/qualcomm/quantizer/TARGETS b/backends/qualcomm/quantizer/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/quantizer/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/recipes/TARGETS b/backends/qualcomm/recipes/BUCK
similarity index 81%
rename from backends/qualcomm/recipes/TARGETS
rename to backends/qualcomm/recipes/BUCK
index dca1e6fd232..e76c3760fb3 100644
--- a/backends/qualcomm/recipes/TARGETS
+++ b/backends/qualcomm/recipes/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 = "qnn_recipes",
     srcs = [
         "__init__.py",
@@ -15,7 +16,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "qnn_recipe_provider",
     srcs = [
         "qnn_recipe_provider.py",
@@ -33,7 +34,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "qnn_recipe_types",
     srcs = [
         "qnn_recipe_types.py",
diff --git a/backends/qualcomm/runtime/BUCK b/backends/qualcomm/runtime/BUCK
index 1e8cc179228..54a222191c8 100644
--- a/backends/qualcomm/runtime/BUCK
+++ b/backends/qualcomm/runtime/BUCK
@@ -1,8 +1,16 @@
+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/backends/qualcomm/runtime/TARGETS was merged into this file, see https://fburl.com/workplace/xl8l9yuo for more info !!!!
+
+load(":targets.bzl", "define_common_targets")
+
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/qualcomm/runtime/TARGETS b/backends/qualcomm/runtime/TARGETS
deleted file mode 100644
index 0a42614a385..00000000000
--- a/backends/qualcomm/runtime/TARGETS
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":targets.bzl", "define_common_targets")
-
-oncall("executorch")
-
-define_common_targets()
diff --git a/backends/qualcomm/utils/TARGETS b/backends/qualcomm/serialization/BUCK
similarity index 59%
rename from backends/qualcomm/utils/TARGETS
rename to backends/qualcomm/serialization/BUCK
index 2341af9282f..f488cf7ec94 100644
--- a/backends/qualcomm/utils/TARGETS
+++ b/backends/qualcomm/serialization/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/backends/qualcomm/serialization/TARGETS b/backends/qualcomm/serialization/TARGETS
deleted file mode 100644
index 2341af9282f..00000000000
--- a/backends/qualcomm/serialization/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/backends/qualcomm/tests/TARGETS b/backends/qualcomm/tests/BUCK
similarity index 88%
rename from backends/qualcomm/tests/TARGETS
rename to backends/qualcomm/tests/BUCK
index 005cc33c7e9..a453e7842c7 100644
--- a/backends/qualcomm/tests/TARGETS
+++ b/backends/qualcomm/tests/BUCK
@@ -1,10 +1,11 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 load("@fbsource//xplat/executorch/backends/qualcomm/qnn_version.bzl", "get_qnn_library_version")
 
 oncall("executorch")
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "models",
     srcs = ["models.py"],
     deps = [
@@ -12,7 +13,7 @@ runtime.python_library(
     ]
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "test_qnn_delegate",
     srcs = [
         "test_qnn_delegate.py",
@@ -41,7 +42,7 @@ runtime.python_library(
     ],
 )
 
-runtime.python_library(
+fbcode_target(_kind = runtime.python_library,
     name = "tester",
     srcs = [
         "tester.py",
@@ -51,7 +52,7 @@ runtime.python_library(
     ]
 )
 
-runtime.python_test(
+fbcode_target(_kind = runtime.python_test,
     name = "test_passes",
     srcs = [
         "test_passes.py",
diff --git a/backends/test/TARGETS b/backends/qualcomm/utils/BUCK
similarity index 59%
rename from backends/test/TARGETS
rename to backends/qualcomm/utils/BUCK
index a6c52d105f6..f488cf7ec94 100644
--- a/backends/test/TARGETS
+++ b/backends/qualcomm/utils/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(is_fbcode = True)
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/test/BUCK b/backends/test/BUCK
index 1e8cc179228..aaded01ffcc 100644
--- a/backends/test/BUCK
+++ b/backends/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/backends/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,is_fbcode = True)