diff --git a/.nfs00000000002397c400000bbd b/.nfs00000000002397c400000bbd
new file mode 100644
index 0000000..a567d14
--- /dev/null
+++ b/.nfs00000000002397c400000bbd
@@ -0,0 +1,36 @@
+#
+# 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_foldable_book_telephony.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := felix
+DEVICE_PATH := device/google/felix
+VENDOR_PATH := vendor/google/felix
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/gs201/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 Fold
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+PRODUCT_SYSTEM_NAME := $(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2092
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME) \
+    PRIVATE_BUILD_DESC="felix-user 14 AP2A.240905.003 12231197 release-keys"
+
+BUILD_FINGERPRINT := google/felix/felix:14/AP2A.240905.003/12231197:user/release-keys
+
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index b608428..fede486 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,8 +17,8 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_felix.mk \
     $(LOCAL_DIR)/aosp_felix_hwasan.mk \
-    $(LOCAL_DIR)/factory_felix.mk
-
+    $(LOCAL_DIR)/factory_felix.mk \
+    $(LOCAL_DIR)/lineage_felix.mk
 
 COMMON_LUNCH_CHOICES := \
     aosp_felix-trunk_staging-userdebug
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
new file mode 100644
index 0000000..eadedb9
--- /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/device-lineage.mk b/device-lineage.mk
new file mode 100644
index 0000000..dc6adb4
--- /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/felix/BoardConfig.mk b/felix/BoardConfig.mk
index 636d303..42f1e5f 100644
--- a/felix/BoardConfig.mk
+++ b/felix/BoardConfig.mk
@@ -42,3 +42,6 @@ include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/felix/proprietary/BoardConfigVendor.mk
 include device/google/felix/sepolicy/felix-sepolicy.mk
 include device/google/felix/wifi/BoardConfig-wifi.mk
+
+DEVICE_PATH := device/google/felix
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
diff --git a/felix/BoardConfigLineage.mk b/felix/BoardConfigLineage.mk
new file mode 100644
index 0000000..996f8be
--- /dev/null
+++ b/felix/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/felix/device-lineage.mk b/felix/device-lineage.mk
new file mode 100644
index 0000000..fd82a16
--- /dev/null
+++ b/felix/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_felix.mk b/lineage_felix.mk
new file mode 100644
index 0000000..791aacb
--- /dev/null
+++ b/lineage_felix.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_foldable_book_telephony.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := felix
+DEVICE_PATH := device/google/felix
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/gs201/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 Fold
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2092
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="felix-user 15 AP3A.241005.015 12366759 release-keys" \
+    BuildFingerprint=google/felix/felix:15/AP3A.241005.015/12366759:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)