diff --git a/lineage_otter.mk b/lineage_otter.mk
index 3e631a7..e75f196 100644
--- a/lineage_otter.mk
+++ b/lineage_otter.mk
@@ -3,28 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
-# Inherit from otter device
-$(call inherit-product, device/shift/otter/device.mk)
+# Inherit from full device.
+$(call inherit-product, device/shift/otter/full_otter.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-# Boot animation
-TARGET_SCREEN_HEIGHT := 2400
-TARGET_SCREEN_WIDTH := 1080
-
-# Device identifier. This must come after all inclusions.
+# Override product name for Lineage.
 PRODUCT_NAME := lineage_otter
-PRODUCT_DEVICE := otter
-PRODUCT_BRAND := SHIFT
-PRODUCT_MODEL := SHIFTphone 8
-PRODUCT_MANUFACTURER := SHIFT
-
-PRODUCT_GMS_CLIENTID_BASE := android-uniscope
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildFingerprint=SHIFT/otter/otter:14/SOS.6.0.20241030/20241030:user/release-keys \