diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/BUCK
index b778789f5a4..2aa4fcd8314 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/BUCK
@@ -16,11 +16,12 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "specmodels",
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     tests = [
         make_dep_path("litho-it/src/test/java/com/facebook/litho/specmodels:specmodels"),
     ],
@@ -46,7 +47,6 @@ fb_java_library(
     ),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
@@ -79,7 +79,6 @@ fb_java_library(
     ),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_ANNOTATIONS_TARGET,
         LITHO_JAVAPOET_TARGET,
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/generator/testing/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/generator/testing/BUCK
index f9f8afeeb16..cc2dc66df96 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/generator/testing/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/generator/testing/BUCK
@@ -13,12 +13,13 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "testing",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     source = "8",
     target = "8",
     tests = [
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/internal/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/internal/BUCK
index 6e3e0abaa2e..bc0a0051143 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/internal/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/internal/BUCK
@@ -12,13 +12,14 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "internal",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     java_version = "8",
     labels = [],
-    oncall = "playgroundapps",
     tests = [
         make_dep_path("litho-it/src/test/java/com/facebook/litho/specmodels:specmodels"),
     ],
@@ -37,7 +38,6 @@ fb_java_library(
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/model/testing/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/model/testing/BUCK
index 1fb2884213a..9396974777c 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/model/testing/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/model/testing/BUCK
@@ -14,12 +14,13 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "testing",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     source = "8",
     target = "8",
     tests = [
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/BUCK
index 9f159a5c1ce..85ada1bdb48 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/BUCK
@@ -16,6 +16,8 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_native.java_annotation_processor(
     name = "processor",
     processor_class = "com.facebook.litho.specmodels.processor.ComponentsProcessor",
@@ -43,7 +45,6 @@ fb_java_library(
     name = "processor-lib",
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     tests = [
         make_dep_path("litho-it/src/test/java/com/facebook/litho/specmodels/processor:processor"),
     ],
@@ -70,7 +71,6 @@ fb_java_library(
     ],
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
@@ -100,7 +100,6 @@ fb_java_library(
     ),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/testing/BUCK b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/testing/BUCK
index 251091e253c..de9468ec071 100644
--- a/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/testing/BUCK
+++ b/litho-processor/src/main/java/com/facebook/litho/specmodels/processor/testing/BUCK
@@ -14,12 +14,13 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "testing",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-rendercore-primitive-components/canvas/BUCK b/litho-rendercore-primitive-components/canvas/BUCK
index b5c61507299..ee64f99c911 100644
--- a/litho-rendercore-primitive-components/canvas/BUCK
+++ b/litho-rendercore-primitive-components/canvas/BUCK
@@ -1,3 +1,4 @@
+oncall("litho_components_for_android")
 load("@fbsource//xplat/pfh/FBApp_UIFrameworks_Litho:DEFS.bzl", "FBApp_UIFrameworks_Litho")
 load(
     "//tools/build_defs/oss:litho_defs.bzl",
@@ -15,7 +16,6 @@ fb_android_library(
     autoglob = False,
     feature = FBApp_UIFrameworks_Litho,
     labels = [],
-    oncall = "litho_components_for_android",
     provided_deps = [
         LITHO_ANDROIDSUPPORT_ANNOTATION_TARGET,
     ],
diff --git a/litho-rendercore-primitive-components/utils/BUCK b/litho-rendercore-primitive-components/utils/BUCK
index e6ade8a49a3..6c324107ee8 100644
--- a/litho-rendercore-primitive-components/utils/BUCK
+++ b/litho-rendercore-primitive-components/utils/BUCK
@@ -1,3 +1,4 @@
+oncall("litho_components_for_android")
 load("@fbsource//xplat/pfh/FBApp_UIFrameworks_Litho:DEFS.bzl", "FBApp_UIFrameworks_Litho")
 load(
     "//tools/build_defs/oss:litho_defs.bzl",
@@ -14,7 +15,6 @@ fb_android_library(
     autoglob = False,
     feature = FBApp_UIFrameworks_Litho,
     labels = [],
-    oncall = "litho_components_for_android",
     provided_deps = [
         LITHO_PROGUARD_ANNOTATIONS_TARGET,
         LITHO_ANDROIDSUPPORT_ANNOTATION_TARGET,
diff --git a/litho-rendercore-primitives/BUCK b/litho-rendercore-primitives/BUCK
index b5da0a8fbd6..18db058469a 100644
--- a/litho-rendercore-primitives/BUCK
+++ b/litho-rendercore-primitives/BUCK
@@ -1,3 +1,4 @@
+oncall("litho_components_for_android")
 load("@fbsource//xplat/pfh/FBApp_UIFrameworks_Litho:DEFS.bzl", "FBApp_UIFrameworks_Litho")
 load(
     "//tools/build_defs/oss:litho_defs.bzl",
@@ -14,7 +15,6 @@ fb_android_library(
     autoglob = False,
     feature = FBApp_UIFrameworks_Litho,
     labels = [],
-    oncall = "litho_components_for_android",
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
diff --git a/litho-rendercore-transitions/BUCK b/litho-rendercore-transitions/BUCK
index bab27e53278..86a7856da02 100644
--- a/litho-rendercore-transitions/BUCK
+++ b/litho-rendercore-transitions/BUCK
@@ -9,6 +9,8 @@ load(
     "fb_android_library",
 )
 
+oncall("litho_components_for_android")
+
 fb_android_library(
     name = "rendercore-transitions-stub",
     srcs = glob(["src/main/java/**/*.java"]),
@@ -16,7 +18,6 @@ fb_android_library(
     feature = FBApp_UIFrameworks_Litho,
     labels = [],
     language = "JAVA",
-    oncall = "litho_components_for_android",
     provided_deps = [
         LITHO_ANDROIDSUPPORT_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-rendercore-visibility/BUCK b/litho-rendercore-visibility/BUCK
index a4ce49d46fc..f5bc1df2b40 100644
--- a/litho-rendercore-visibility/BUCK
+++ b/litho-rendercore-visibility/BUCK
@@ -11,6 +11,8 @@ load(
     "fb_android_library",
 )
 
+oncall("litho_components_for_android")
+
 fb_android_library(
     name = "rendercore-visibility-stub",
     srcs = glob(["src/main/java/**/*.java"]),
@@ -18,7 +20,6 @@ fb_android_library(
     feature = FBApp_UIFrameworks_Litho,
     labels = [],
     language = "JAVA",
-    oncall = "litho_components_for_android",
     provided_deps = [
         LITHO_ANDROIDSUPPORT_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-sections-annotations/src/main/java/com/facebook/litho/sections/annotations/BUCK b/litho-sections-annotations/src/main/java/com/facebook/litho/sections/annotations/BUCK
index e9ff584bf72..f7543f330f0 100644
--- a/litho-sections-annotations/src/main/java/com/facebook/litho/sections/annotations/BUCK
+++ b/litho-sections-annotations/src/main/java/com/facebook/litho/sections/annotations/BUCK
@@ -6,12 +6,13 @@
 load("@fbsource//xplat/pfh/FBApp_UIFrameworks_Litho_Litho:DEFS.bzl", "FBApp_UIFrameworks_Litho_Litho")
 load("//tools/build_defs/oss:litho_defs.bzl", "fb_java_library")
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "annotations",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
diff --git a/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/model/BUCK b/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/model/BUCK
index 101bee1139a..cd065a29055 100644
--- a/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/model/BUCK
+++ b/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/model/BUCK
@@ -15,6 +15,8 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_java_library(
     name = "model",
     srcs = glob([
@@ -23,7 +25,6 @@ fb_java_library(
     ]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     source = "8",
     target = "8",
     visibility = [
@@ -49,7 +50,6 @@ fb_java_library(
     ]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/processor/BUCK b/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/processor/BUCK
index 51671b22a23..7ffe3e059c3 100644
--- a/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/processor/BUCK
+++ b/litho-sections-processor/src/main/java/com/facebook/litho/sections/specmodels/processor/BUCK
@@ -17,6 +17,8 @@ load(
     "make_dep_path",
 )
 
+oncall("playgroundapps")
+
 fb_native.java_annotation_processor(
     name = "processor",
     processor_class = "com.facebook.litho.sections.specmodels.processor.SectionsComponentProcessor",
@@ -37,7 +39,6 @@ fb_java_library(
     ]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     source = "8",
     target = "8",
     visibility = ["PUBLIC"],
@@ -64,7 +65,6 @@ fb_java_library(
     ]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     provided_deps = [
         LITHO_JAVAPOET_TARGET,
         LITHO_JSR_TARGET,
diff --git a/litho-testing/src/main/java/com/facebook/litho/testing/inlinelayoutspec/BUCK b/litho-testing/src/main/java/com/facebook/litho/testing/inlinelayoutspec/BUCK
index 81e9e556a9d..bef47ccda98 100644
--- a/litho-testing/src/main/java/com/facebook/litho/testing/inlinelayoutspec/BUCK
+++ b/litho-testing/src/main/java/com/facebook/litho/testing/inlinelayoutspec/BUCK
@@ -11,12 +11,13 @@ load(
     "fb_core_android_library",
 )
 
+oncall("playgroundapps")
+
 fb_core_android_library(
     name = "inlinelayoutspec",
     srcs = glob(["*.java"]),
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     visibility = LITHO_TESTING_UTIL_VISIBILITY,
     deps = [
         LITHO_JAVA_TARGET,
diff --git a/litho-widget/BUCK b/litho-widget/BUCK
index 8b0c237aa9b..e9edb54900f 100644
--- a/litho-widget/BUCK
+++ b/litho-widget/BUCK
@@ -6,11 +6,12 @@
 load("@fbsource//xplat/pfh/FBApp_UIFrameworks_Litho_Litho:DEFS.bzl", "FBApp_UIFrameworks_Litho_Litho")
 load("//tools/build_defs/oss:litho_defs.bzl", "fb_android_resource")
 
+oncall("playgroundapps")
+
 fb_android_resource(
     name = "res",
     feature = FBApp_UIFrameworks_Litho_Litho,
     labels = [],
-    oncall = "playgroundapps",
     package = "com.facebook.litho.widget",
     res = "src/main/res",
     visibility = [
diff --git a/sample/src/test/java/com/facebook/samples/litho/BUCK b/sample/src/test/java/com/facebook/samples/litho/BUCK
index 19bbe33357e..7939ae9cf99 100644
--- a/sample/src/test/java/com/facebook/samples/litho/BUCK
+++ b/sample/src/test/java/com/facebook/samples/litho/BUCK
@@ -28,6 +28,8 @@ load(
     "make_dep_path",
 )
 
+oncall("components_for_android")
+
 litho_robolectric4_test(
     name = "litho",
     srcs = glob([