diff --git a/BoardConfigAosp.mk b/BoardConfigAosp.mk
new file mode 100644
index 0000000..bfa09f8
--- /dev/null
+++ b/BoardConfigAosp.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2023 PixelOS
+#
+# 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.
+#
\ No newline at end of file
diff --git a/aosp_lynx.mk b/aosp_lynx.mk
index 1850584..a6f6ced 100644
--- a/aosp_lynx.mk
+++ b/aosp_lynx.mk
@@ -22,12 +22,28 @@ BOARD_USES_SWIFTSHADER := true
 
 $(call inherit-product, device/google/gs201/aosp_common.mk)
 $(call inherit-product, device/google/lynx/device-lynx.mk)
+$(call inherit-product, device/google/lynx/device-aosp.mk)
+$(call inherit-product, device/google/gs201/device-common-aosp.mk)
+
+# Inherit some common PixelOS stuff.
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
 
 PRODUCT_NAME := aosp_lynx
 PRODUCT_DEVICE := lynx
-PRODUCT_MODEL := AOSP on Lynx
-PRODUCT_BRAND := Android
+PRODUCT_MODEL := Pixel 7a
+PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
 DEVICE_MANIFEST_FILE := \
 	device/google/lynx/manifest.xml
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2400
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    TARGET_PRODUCT=lynx \
+    PRIVATE_BUILD_DESC="lynx-user 14 AP1A.240505.005 11677807 release-keys"
+
+BUILD_FINGERPRINT := google/lynx/lynx:14/AP1A.240505.005/11677807:user/release-keys
diff --git a/device-aosp.mk b/device-aosp.mk
new file mode 100644
index 0000000..bfa09f8
--- /dev/null
+++ b/device-aosp.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2023 PixelOS
+#
+# 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.
+#
\ No newline at end of file
diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk
index fa7407f..1df33c6 100644
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -46,3 +46,4 @@ include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx-sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
+include device/google/lynx/BoardConfigAosp.mk