diff --git a/device/testing/device-shift-otter/APKBUILD b/device/testing/device-shift-otter/APKBUILD
new file mode 100644
index 000000000..cd44c98f8
--- /dev/null
+++ b/device/testing/device-shift-otter/APKBUILD
@@ -0,0 +1,39 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Caleb Connolly <caleb@postmarketos.org>
+# Co-Maintainer: Alexander Martinz <amartinz@shiftphones.com>
+pkgname=device-shift-otter
+pkgdesc="SHIFTphone 8"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-qcom-adreno-a660
+	firmware-shift-otter
+	linux-postmarketos-qcom-sc7280
+	make-dynpart-mappings
+	mkbootimg
+	postmarketos-base
+	soc-qcom-sc7280
+	soc-qcom-sc7280-qbootctl
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+3e4ea7fa643dfa0205707dfa6ad8c12c8e35be8ae0c7684479e3981b498d33ee55b636760cb4574f99d8f88df49a4f098cb6fc3b8b248840ab9886501108f309  deviceinfo
+57316402c428390cb683f03da817308e008e246e01e88c95d60fc14d736156ce6cc7915633d973347a56c721022913192928799310f14839afe8d00de2efa14c  modules-initfs
+"
diff --git a/device/testing/device-shift-otter/deviceinfo b/device/testing/device-shift-otter/deviceinfo
new file mode 100644
index 000000000..5a79795ea
--- /dev/null
+++ b/device/testing/device-shift-otter/deviceinfo
@@ -0,0 +1,45 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="SHIFTphone 8"
+deviceinfo_manufacturer="SHIFT"
+deviceinfo_codename="shift-otter"
+deviceinfo_year="2024"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2400"
+deviceinfo_getty="ttyMSM0;115200"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_header_version="2"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_dtb="0x01f00000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00000000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+
+# Kernel
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="qcom/qcm6490-shift-otter"
+deviceinfo_flash_kernel_on_update="true"
+deviceinfo_initfs_compression="zstd:fast"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
+deviceinfo_super_partitions="/dev/sda9 /dev/sda9"
diff --git a/device/testing/device-shift-otter/modules-initfs b/device/testing/device-shift-otter/modules-initfs
new file mode 100644
index 000000000..6acbf4fd9
--- /dev/null
+++ b/device/testing/device-shift-otter/modules-initfs
@@ -0,0 +1,8 @@
+focaltech_ts
+fsa4480
+gpi
+msm
+panel-shift-sh8804b
+pmic_glink
+qcom_glink_smem
+ucsi_glink
diff --git a/device/testing/firmware-shift-otter/APKBUILD b/device/testing/firmware-shift-otter/APKBUILD
new file mode 100644
index 000000000..1e9a2d491
--- /dev/null
+++ b/device/testing/firmware-shift-otter/APKBUILD
@@ -0,0 +1,27 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Caleb Connolly <caleb@postmarketos.org>
+# Co-Maintainer: Alexander Martinz <amartinz@shiftphones.com>
+pkgname=firmware-shift-otter
+pkgver=20240304
+pkgrel=0
+pkgdesc="Firmware for SHIFTphone 8"
+url="https://github.com/SomeBlobs/firmware-shift-otter"
+arch="aarch64"
+license="proprietary"
+makedepends="bash pil-squasher"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="75058a91d2dd296a5a92b348d767e2c499e551fe"
+source="https://github.com/SomeBlobs/firmware-shift-otter/archive/$_commit/firmware-shift-otter-$_commit.tar.gz"
+builddir="$srcdir/firmware-shift-otter-$_commit"
+
+build() {
+	make prepare
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+62120a644fa4c39074df94d79bb72adac9944d5553f739171ece207bd401a1e9b50a4577b6bc7ba9e8d87ed7b7201a1b3f46d7341dd0880ea2f2d86bcd6ad67f  firmware-shift-otter-75058a91d2dd296a5a92b348d767e2c499e551fe.tar.gz
+"