diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2bfef90..f2de406 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -53,7 +53,7 @@ BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_SEPARATED_DTBO := true
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
 TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc
-TARGET_KERNEL_SOURCE := kernel/oneplus/sm7250
+TARGET_KERNEL_SOURCE := kernel/oneplus/$(TARGET_DEVICE)
 TARGET_KERNEL_CLANG_COMPILE := true
 TARGET_KERNEL_CONFIG := vendor/lito-perf_defconfig
 
@@ -132,7 +132,7 @@ TARGET_SURFACEFLINGER_FOD_LIB := //hardware/oneplus:libfod_extension.oneplus
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(COMMON_PATH)/device_framework_matrix.xml \
-    vendor/lineage/config/device_framework_matrix.xml
+    vendor/aosp/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 
@@ -144,11 +144,6 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744
-ifneq ($(WITH_GMS),true)
-BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
-BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1
-BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT := -1
-endif
 BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/aosp.dependencies b/aosp.dependencies
new file mode 100644
index 0000000..824cce5
--- /dev/null
+++ b/aosp.dependencies
@@ -0,0 +1,13 @@
+[
+  {
+    "repository"  : "hardware_oneplus",
+    "target_path" : "hardware/oneplus",
+    "remote"      : "pixel"
+  },
+  {
+    "repository"  : "vendor_oneplus_sm7250-common",
+    "target_path" : "vendor/oneplus/sm7250-common",
+    "branch"      : "eleven",
+    "remote"      : "pixel-devices-blobs"
+  }
+]
diff --git a/common.mk b/common.mk
index a9e58ac..fe072bd 100644
--- a/common.mk
+++ b/common.mk
@@ -33,7 +33,7 @@ PRODUCT_COPY_FILES += \
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay-aosp
 
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index d51a83d..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "repository": "android_hardware_oneplus",
-    "target_path": "hardware/oneplus"
-  },
-  {
-    "repository": "android_kernel_oneplus_sm8250",
-    "target_path": "kernel/oneplus/sm8250"
-  }
-]
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-aosp/frameworks/base/core/res/res/values/config.xml
similarity index 91%
rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
rename to overlay-aosp/frameworks/base/core/res/res/values/config.xml
index 56197ea..6c1d631 100644
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-aosp/frameworks/base/core/res/res/values/config.xml
@@ -65,11 +65,4 @@
     <!-- Whether device has screen with higher aspect ratio -->
     <bool name="config_haveHigherAspectRatioScreen">true</bool>
 
-    <!-- Defines the actions shown in advanced reboot submenu -->
-    <string-array name="config_restartActionsList">
-        <item>restart</item>
-        <item>restart_recovery</item>
-        <item>restart_bootloader</item>
-        <item>restart_fastboot</item>
-     </string-array>
 </resources>
diff --git a/overlay-lineage/hardware/oneplus/doze/res/values/config.xml b/overlay-aosp/hardware/oneplus/doze/res/values/config.xml
similarity index 100%
rename from overlay-lineage/hardware/oneplus/doze/res/values/config.xml
rename to overlay-aosp/hardware/oneplus/doze/res/values/config.xml
diff --git a/overlay-lineage/packages/apps/Settings/res/values/arrays.xml b/overlay-aosp/packages/apps/Settings/res/values/arrays.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Settings/res/values/arrays.xml
rename to overlay-aosp/packages/apps/Settings/res/values/arrays.xml
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-aosp/packages/apps/Settings/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Settings/res/values/config.xml
rename to overlay-aosp/packages/apps/Settings/res/values/config.xml
diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 07152fc..0000000
--- a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014-2015 The CyanogenMod Project
-                   2019-2021 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <!-- Default for LineageSettings.Secure.VOLUME_PANEL_ON_LEFT -->
-    <bool name="def_volume_panel_on_left">true</bool>
-</resources>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
deleted file mode 100644
index da46c31..0000000
--- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
deleted file mode 100644
index 1292c64..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2006, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-    <dimen name="rounded_corner_radius">4dp</dimen>
-</resources>