diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index aee829d..01e6bf0 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -1,6 +1,22 @@
 {
-  // Looking for unit test presubmit configuration?
-  // This currently lives in ATP config apct/system_ui/unit_test
+  // Curious where your @Scenario tests will run?
+  //
+  // @Ignore: Will not run in any configuration
+  //
+  // @FlakyTest: Tests that don't block pre/postsubmit but are staged to run known failures
+  //
+  // @Postsubmit: Runs in platinum suite and blocks droidfood in postsubmit
+  //
+  // @PlatinumTest: As of May, 2023, running in postsubmit. Set to run in presubmit as part of
+  // v2/android-platinum/suite-test-mapping-platinum-sysui
+  // Please DO NOT annotate new or old tests with @PlatinumTest annotation without discussing
+  // with mdb:android-platinum
+  //
+  // As of May, 2023, If you don't use @Postsubmit, your new test will immediately
+  // block presubmit, which is probably NOT what you want. This will change effectively once
+  // we move to @PlatinumTest annotation.
+
+  // v2/sysui/test-mapping-presubmit-sysui_cloud-tf
   "presubmit-sysui": [
     {
       "name": "PlatformScenarioTests",
@@ -23,6 +39,7 @@
       ]
     }
   ],
+  // v2/android-virtual-infra/test_mapping/presubmit-avd
   "presubmit": [
     {
       "name": "SystemUIGoogleTests",
@@ -75,21 +92,6 @@
       ]
     }
   ],
-
-  // Curious where your @Scenario tests will run?
-  //
-  // @Ignore: nowhere
-  // @FlakyTest: in staged-postsubmit, but not blocking postsubmit or
-  // presubmit
-  // @Postsubmit: in postsubmit and staged-postsubmit, but not presubmit
-  // none of the above: in presubmit, postsubmit, and staged-postsubmit
-  //
-  // Ideally, please annotate new tests with @FlakyTest, then with @Postsubmit
-  // once they're ready for postsubmit as they will immediately block go/android-platinum,
-  // then with neither once they're ready for presubmit.
-  //
-  // If you don't use @Postsubmit, your new test will immediately
-  // block presubmit, which is probably not what you want!
   "auto-end-to-end-postsubmit": [
     {
       "name": "AndroidAutomotiveHomeTests",
@@ -107,5 +109,27 @@
         }
       ]
     }
+  ],
+  "silver-sysui": [
+   {
+      "name": "PlatformScenarioTests",
+      "options": [
+        {
+            "include-filter": "android.platform.test.scenario.sysui"
+        },
+        {
+            "include-annotation": "android.platform.test.scenario.annotation.Scenario"
+        },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+            "exclude-annotation": "android.platform.test.annotations.PlatinumTest"
+        },
+        {
+            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        }
+      ]
+    }
   ]
 }