diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0390c151..b3478a03 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -29,7 +29,11 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_ripcurrent24.mk \
     $(LOCAL_DIR)/aosp_tokay.mk \
     $(LOCAL_DIR)/aosp_tokay_fullmte.mk \
-    $(LOCAL_DIR)/factory_tokay.mk
+    $(LOCAL_DIR)/factory_tokay.mk \
+    $(LOCAL_DIR)/lineage_caiman.mk \
+    $(LOCAL_DIR)/lineage_komodo.mk \
+    $(LOCAL_DIR)/lineage_tokay.mk
+
 COMMON_LUNCH_CHOICES := \
     aosp_caiman-trunk_staging-userdebug \
     aosp_komodo-trunk_staging-userdebug \
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
new file mode 100644
index 00000000..eadedb98
--- /dev/null
+++ b/BoardConfigLineage.mk
@@ -0,0 +1,5 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk
index 075218f8..da92c3c0 100644
--- a/caiman/BoardConfig.mk
+++ b/caiman/BoardConfig.mk
@@ -31,3 +31,6 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif
+
+DEVICE_PATH := device/google/caimito
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
diff --git a/caiman/BoardConfigLineage.mk b/caiman/BoardConfigLineage.mk
new file mode 100644
index 00000000..996f8be3
--- /dev/null
+++ b/caiman/BoardConfigLineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
diff --git a/caiman/device-lineage.mk b/caiman/device-lineage.mk
new file mode 100644
index 00000000..fd82a166
--- /dev/null
+++ b/caiman/device-lineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
diff --git a/device-lineage.mk b/device-lineage.mk
new file mode 100644
index 00000000..dc6adb47
--- /dev/null
+++ b/device-lineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk
index a46cccc6..dc27ca95 100644
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@@ -31,3 +31,6 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif
+
+DEVICE_PATH := device/google/caimito
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
diff --git a/komodo/BoardConfigLineage.mk b/komodo/BoardConfigLineage.mk
new file mode 100644
index 00000000..996f8be3
--- /dev/null
+++ b/komodo/BoardConfigLineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
diff --git a/komodo/device-lineage.mk b/komodo/device-lineage.mk
new file mode 100644
index 00000000..fd82a166
--- /dev/null
+++ b/komodo/device-lineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
diff --git a/lineage_caiman.mk b/lineage_caiman.mk
new file mode 100644
index 00000000..49dd00ff
--- /dev/null
+++ b/lineage_caiman.mk
@@ -0,0 +1,30 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := caiman
+DEVICE_PATH := device/google/caimito
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/zumapro/lineage_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 9 Pro
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2856
+TARGET_SCREEN_WIDTH := 1280
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="caiman-user 15 AP3A.241005.015 12366759 release-keys" \
+    BuildFingerprint=google/caiman/caiman:15/AP3A.241005.015/12366759:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
diff --git a/lineage_komodo.mk b/lineage_komodo.mk
new file mode 100644
index 00000000..d2848a70
--- /dev/null
+++ b/lineage_komodo.mk
@@ -0,0 +1,30 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := komodo
+DEVICE_PATH := device/google/caimito
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/zumapro/lineage_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 9 Pro XL
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2992
+TARGET_SCREEN_WIDTH := 1344
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="komodo-user 15 AP3A.241005.015 12366759 release-keys" \
+    BuildFingerprint=google/komodo/komodo:15/AP3A.241005.015/12366759:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
diff --git a/lineage_tokay.mk b/lineage_tokay.mk
new file mode 100644
index 00000000..1b93c0a4
--- /dev/null
+++ b/lineage_tokay.mk
@@ -0,0 +1,30 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := tokay
+DEVICE_PATH := device/google/caimito
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/zumapro/lineage_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 9
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2424
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="tokay-user 15 AP3A.241005.015 12366759 release-keys" \
+    BuildFingerprint=google/tokay/tokay:15/AP3A.241005.015/12366759:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index ffb8b000..1aac263c 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -31,3 +31,6 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif
+
+DEVICE_PATH := device/google/caimito
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
diff --git a/tokay/BoardConfigLineage.mk b/tokay/BoardConfigLineage.mk
new file mode 100644
index 00000000..996f8be3
--- /dev/null
+++ b/tokay/BoardConfigLineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
diff --git a/tokay/device-lineage.mk b/tokay/device-lineage.mk
new file mode 100644
index 00000000..fd82a166
--- /dev/null
+++ b/tokay/device-lineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage