diff --git a/backends/arm/TARGETS b/backends/arm/TARGETS
index 35b16f819e5..0d947d63903 100644
--- a/backends/arm/TARGETS
+++ b/backends/arm/TARGETS
@@ -14,7 +14,8 @@ runtime.python_library(
         "ethosu/partitioner.py"
     ],
     deps = [
-        ":arm_partitioner",
+        ":arm_vela",
+        "//executorch/backends/arm/tosa:arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -25,7 +26,7 @@ runtime.python_library(
         "vgf/partitioner.py"
     ],
     deps = [
-        ":arm_partitioner",
+        "//executorch/backends/arm/tosa:arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -50,21 +51,6 @@ runtime.python_library(
         "//executorch/exir:lib",
     ],
 )
-runtime.python_library(
-    name = "arm_partitioner",
-    srcs = [
-        "tosa/backend.py",
-        "tosa/partitioner.py",
-    ],
-    deps = [
-        ":arm_backend",
-        ":constants",
-        "//executorch/backends/arm/debug:schema",
-        "//executorch/backends/arm/operator_support:operator_support",
-        "//executorch/backends/arm/_passes:passes",
-        "//executorch/exir:lib",
-    ],
-)
 runtime.python_library(
     name = "arm_backend",
     srcs = [
@@ -77,7 +63,6 @@ runtime.python_library(
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/serializer:serializer",
         "fbsource//third-party/tosa_tools/v0.80/serialization_lib/python/tosa:tosa",
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/tosa:tosa",
-        ":arm_vela",
         ":process_node",
         "//executorch/backends/arm/operators:lib",
         "//executorch/backends/arm/operators:node_visitor",
diff --git a/backends/arm/tosa/TARGETS b/backends/arm/tosa/TARGETS
index b1df4f37c53..18868054259 100644
--- a/backends/arm/tosa/TARGETS
+++ b/backends/arm/tosa/TARGETS
@@ -59,3 +59,20 @@ runtime.python_library(
        ":specification",
     ],
 )
+
+runtime.python_library(
+    name = "arm_partitioner",
+    srcs = [
+        "backend.py",
+        "partitioner.py",
+    ],
+    deps = [
+        "//executorch/backends/arm:arm_backend",
+        "//executorch/backends/arm:constants",
+        "//executorch/backends/arm:process_node",
+        "//executorch/backends/arm/debug:schema",
+        "//executorch/backends/arm/operator_support:operator_support",
+        "//executorch/backends/arm/_passes:passes",
+        "//executorch/exir:lib",
+    ],
+)
diff --git a/codegen/tools/targets.bzl b/codegen/tools/targets.bzl
index 39de8fcb482..acea3370e7d 100644
--- a/codegen/tools/targets.bzl
+++ b/codegen/tools/targets.bzl
@@ -17,10 +17,10 @@ def define_common_targets(is_fbcode = False):
         ],
         deps = [
             "//executorch/codegen:gen_lib",
-        ] + select({
+        ] + ([] if runtime.is_oss else select({
             "DEFAULT": [],
-            "ovr_config//os:linux": [] if runtime.is_oss else ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
-        }),
+            "ovr_config//os:linux": ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
+        })),
     )
 
     runtime.python_binary(
diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
index bbf4a0fe789..46101ab36db 100644
--- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl
+++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
@@ -290,6 +290,7 @@ def _cxx_test(*args, **kwargs):
 
 def _cxx_python_extension(*args, **kwargs):
     _patch_kwargs_common(kwargs)
+    _remove_caffe2_deps(kwargs)
     kwargs["srcs"] = _patch_executorch_references(kwargs["srcs"])
     if "types" in kwargs:
         kwargs["types"] = _patch_executorch_references(kwargs["types"])
@@ -324,8 +325,19 @@ def _genrule(*args, **kwargs):
         kwargs["name"] += "_static"
         env.genrule(*args, **kwargs)
 
+def _remove_caffe2_deps(kwargs):
+    if not env.is_oss:
+        return
+    # We don't have Buckified PyTorch in OSS. At least let buck query work.
+    MISSING_BUCK_DIRS = ("//caffe2", "//pytorch", "fbsource//third-party")
+    for dep_type in ('deps', 'exported_deps'):
+        if dep_type not in kwargs:
+            continue
+        kwargs[dep_type] = [x for x in kwargs[dep_type] if not any([x.startswith(y) for y in MISSING_BUCK_DIRS])]
+
 def _python_library(*args, **kwargs):
     _patch_kwargs_common(kwargs)
+    _remove_caffe2_deps(kwargs)
     env.python_library(*args, **kwargs)
 
 def _python_binary(*args, **kwargs):