diff --git a/.github/workflows/clean-up.yml b/.github/workflows/clean-up.yml
index 5d5b60bc8..bdf069901 100644
--- a/.github/workflows/clean-up.yml
+++ b/.github/workflows/clean-up.yml
@@ -72,6 +72,8 @@ on:
           - OP-ACE
           # OnePlus Tablets & Others
           - OP-OPEN
+          - OP-PAD-4
+          - OP-PAD-3-PRO
           - OP-PAD-3-SM8750
           - OP-PAD-3-MT6897
           - OP-PAD-2-PRO
diff --git a/configs/oos16/OP-PAD-3-PRO.json b/configs/oos16/OP-PAD-3-PRO.json
new file mode 100644
index 000000000..ff662b4c8
--- /dev/null
+++ b/configs/oos16/OP-PAD-3-PRO.json
@@ -0,0 +1,26 @@
+{
+  "model": "OP-PAD-3-PRO",
+  "soc": "canoe",
+  "branch": "wild/sm8850",
+  "manifest": "oneplus_pad_3_pro_w.xml",
+  "android_version": "android16",
+  "kernel_version": "6.12",
+  "os_version": "OOS16",
+  "lto": "none",
+  "zyc_compiler": "",
+  "c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r547379/bin",
+  "rust_compiler": "kernel_platform/prebuilts/rust/linux-x86/1.82.0/bin",
+  "bindgen": "",
+  "rust_build": true,
+  "disk_cleanup": true,
+  "hmbird": false,
+  "susfs": true,
+  "ds": true,
+  "bbg": true,
+  "bbr": true,
+  "ttl": true,
+  "ip_set": true,
+  "unicode": true,
+  "ntsync": true,
+  "uname": "OP-WILD"
+}
diff --git a/configs/oos16/OP-PAD-4.json b/configs/oos16/OP-PAD-4.json
new file mode 100644
index 000000000..96caa5791
--- /dev/null
+++ b/configs/oos16/OP-PAD-4.json
@@ -0,0 +1,26 @@
+{
+  "model": "OP-PAD-4",
+  "soc": "canoe",
+  "branch": "wild/sm8850",
+  "manifest": "oneplus_pad_4_w.xml",
+  "android_version": "android16",
+  "kernel_version": "6.12",
+  "os_version": "OOS16",
+  "lto": "none",
+  "zyc_compiler": "",
+  "c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r547379/bin",
+  "rust_compiler": "kernel_platform/prebuilts/rust/linux-x86/1.82.0/bin",
+  "bindgen": "",
+  "rust_build": true,
+  "disk_cleanup": true,
+  "hmbird": false,
+  "susfs": true,
+  "ds": true,
+  "bbg": true,
+  "bbr": true,
+  "ttl": true,
+  "ip_set": true,
+  "unicode": true,
+  "ntsync": true,
+  "uname": "OP-WILD"
+}
diff --git a/manifests/oos16/oneplus_pad_3_pro_w.xml b/manifests/oos16/oneplus_pad_3_pro_w.xml
new file mode 100644
index 000000000..8cddb2c70
--- /dev/null
+++ b/manifests/oos16/oneplus_pad_3_pro_w.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch="https://git.codelinaro.org/clo/la" name="clo-la"/>
+  <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
+  <remote fetch="https://github.com/WildKernels" name="wild"/>
+  <default remote="clo-la" revision="dummy_revision" sync-c="true" sync-tags="false"/>
+  <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="d1ebdc2002c557ceff9939afc3098eb88916f464"/>
+  
+  <project remote="origin" name="android_kernel_common_oneplus_sm8850" path="kernel_platform/common" revision="oneplus/sm8850_b_16.0_pad_3_pro" clone-depth="1">
+    <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
+  </project>
+  
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8850" path="./" revision="oneplus/sm8850_b_16.0_pad_3_pro" clone-depth="1"/>
+  
+  <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="4ba19a61c7a0d63603e0d1c84eb2b610bff706a4" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk">
+    <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
+  </project>
+  <project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="e6e84a60b1b4b68ee7de5a66fa63fc95fe9fe131" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk"/>
+  <project remote="clo-la" name="kernel_platform/prebuilts/rust" path="kernel_platform/prebuilts/rust" revision="6ff98fecc15373d056564f1ad13508f812d90fa9" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk"/>
+  <project remote="clo-la" name="kernel_platform/prebuilts/clang-tools" path="kernel_platform/prebuilts/clang-tools" revision="8d2e8177f56ed0543cc8866ecad6f9f32f25fffe" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk">
+    <linkfile dest="kernel_platform/build/prebuilts/clang-tools" src="."/>
+  </project>
+</manifest>
diff --git a/manifests/oos16/oneplus_pad_4_w.xml b/manifests/oos16/oneplus_pad_4_w.xml
new file mode 100644
index 000000000..2852e7e93
--- /dev/null
+++ b/manifests/oos16/oneplus_pad_4_w.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch="https://git.codelinaro.org/clo/la" name="clo-la"/>
+  <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
+  <remote fetch="https://github.com/WildKernels" name="wild"/>
+  <default remote="clo-la" revision="dummy_revision" sync-c="true" sync-tags="false"/>
+  <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="d1ebdc2002c557ceff9939afc3098eb88916f464"/>
+  
+  <project remote="origin" name="android_kernel_common_oneplus_sm8850" path="kernel_platform/common" revision="oneplus/sm8850_b_16.0_pad_4" clone-depth="1">
+    <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
+  </project>
+  
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8850" path="./" revision="oneplus/sm8850_b_16.0_pad_4" clone-depth="1"/>
+  
+  <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="4ba19a61c7a0d63603e0d1c84eb2b610bff706a4" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk">
+    <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
+  </project>
+  <project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="e6e84a60b1b4b68ee7de5a66fa63fc95fe9fe131" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk"/>
+  <project remote="clo-la" name="kernel_platform/prebuilts/rust" path="kernel_platform/prebuilts/rust" revision="6ff98fecc15373d056564f1ad13508f812d90fa9" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk"/>
+  <project remote="clo-la" name="kernel_platform/prebuilts/clang-tools" path="kernel_platform/prebuilts/clang-tools" revision="8d2e8177f56ed0543cc8866ecad6f9f32f25fffe" upstream="refs/heads/ks-kernel.lnx.5.0.r3-rel" groups="ddk">
+    <linkfile dest="kernel_platform/build/prebuilts/clang-tools" src="."/>
+  </project>
+</manifest>