diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 1ccd2e0a..c9bde05c 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -37,6 +37,7 @@ PRODUCT_MAKEFILES += \
     $(LOCAL_DIR)/oneplus7t/pa_oneplus7t.mk \
     $(LOCAL_DIR)/oneplus7tpro/pa_oneplus7tpro.mk \
     $(LOCAL_DIR)/oneplus8/pa_oneplus8.mk \
+    $(LOCAL_DIR)/oneplus8t/pa_oneplus8t.mk \
     $(LOCAL_DIR)/polaris/pa_polaris.mk \
     $(LOCAL_DIR)/raphael/pa_raphael.mk \
     $(LOCAL_DIR)/rolex/pa_rolex.mk \
@@ -70,6 +71,7 @@ COMMON_LUNCH_CHOICES += \
     pa_oneplus7t-userdebug \
     pa_oneplus7tpro-userdebug \
     pa_oneplus8-userdebug \
+    pa_oneplus8t-userdebug \
     pa_polaris-userdebug \
     pa_rolex-userdebug \
     pa_rosy-userdebug \
diff --git a/products/oneplus8t/pa.dependencies b/products/oneplus8t/pa.dependencies
new file mode 100644
index 00000000..ec7b265d
--- /dev/null
+++ b/products/oneplus8t/pa.dependencies
@@ -0,0 +1,51 @@
+[
+
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_device_oneplus_oneplus8",
+        "target_path":  "device/oneplus/oneplus8",
+        "revision":     "ruby"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_device_oneplus_oneplus8t",
+        "target_path":  "device/oneplus/oneplus8t",
+        "revision":     "ruby"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_hardware_qcom_audio",
+        "target_path":  "vendor/qcom/opensource/audio-hal/primary-hal",
+        "revision":     "ruby-smxx50"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_hardware_qcom_display",
+        "target_path":  "hardware/qcom/display",
+        "revision":     "ruby-smxx50"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_hardware_qcom_gps",
+        "target_path":  "hardware/qcom/gps",
+        "revision":     "ruby-smxx50"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_hardware_qcom_media",
+        "target_path":  "hardware/qcom/media",
+        "revision":     "ruby-smxx50"
+    },
+    {
+        "remote":       "aospa",
+        "repository":   "AOSPA/android_kernel_oneplus_sm8250",
+        "target_path":  "kernel/msm-4.19",
+        "revision":     "ruby"
+    },
+    {
+        "remote":       "blobs",
+        "repository":   "proprietary_vendor_oneplus",
+        "target_path":  "vendor/oneplus",
+        "revision":     "ruby"
+    }
+]
diff --git a/products/oneplus8t/pa_oneplus8t.mk b/products/oneplus8t/pa_oneplus8t.mk
new file mode 100644
index 00000000..271725d2
--- /dev/null
+++ b/products/oneplus8t/pa_oneplus8t.mk
@@ -0,0 +1,37 @@
+# Copyright (C) 2020 Paranoid Android
+#
+# 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.
+
+ifeq (pa_oneplus8t,$(TARGET_PRODUCT))
+
+# 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/aosp_base_telephony.mk)
+
+# Inherit from the custom device configuration.
+$(call inherit-product, device/oneplus/oneplus8t/device.mk)
+
+# Inherit from the AOSPA configuration.
+$(call inherit-product, vendor/pa/config/common_full_phone.mk)
+
+TARGET_BOOT_ANIMATION_RES := 1080
+
+PRODUCT_BRAND := OnePlus
+PRODUCT_DEVICE := oneplus8t
+PRODUCT_MANUFACTURER := OnePlus
+PRODUCT_MODEL := OnePlus 8T
+PRODUCT_NAME := pa_oneplus8t
+
+PRODUCT_GMS_CLIENTID_BASE := android-oneplus
+
+endif