diff --git a/OWNERS b/OWNERS
index 01bcfad..4d9907d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1 @@
-jiwonshin@google.com
 yim@google.com
-yuexima@google.com
diff --git a/config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk b/config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk~HEAD
similarity index 100%
rename from config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk
rename to config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk~HEAD
diff --git a/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml~HEAD
similarity index 100%
rename from config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml
rename to config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml~HEAD
diff --git a/config/power/V1_1/iface_fuzzer/AndroidTest.xml b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
index e0909c4..78ed9f1 100644
--- a/config/power/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
@@ -3,7 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalPowerV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
index e7ea0f8..3d3d4bf 100644
--- a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
@@ -3,7 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalThermalV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
index b745be0..3e5351c 100644
--- a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
@@ -3,7 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalVibratorV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
index 020f68e..b560e71 100644
--- a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
@@ -3,7 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalWifiV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/iface_fuzzer/OWNERS b/iface_fuzzer/OWNERS
new file mode 100644
index 0000000..01bcfad
--- /dev/null
+++ b/iface_fuzzer/OWNERS
@@ -0,0 +1,3 @@
+jiwonshin@google.com
+yim@google.com
+yuexima@google.com
diff --git a/kernel/OWNERS b/kernel/OWNERS
new file mode 100644
index 0000000..01bcfad
--- /dev/null
+++ b/kernel/OWNERS
@@ -0,0 +1,3 @@
+jiwonshin@google.com
+yim@google.com
+yuexima@google.com