diff --git a/device/testing/device-lenovo-yoga-c630/APKBUILD b/device/testing/device-lenovo-yoga-c630/APKBUILD
new file mode 100644
index 000000000..a5416d874
--- /dev/null
+++ b/device/testing/device-lenovo-yoga-c630/APKBUILD
@@ -0,0 +1,35 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-lenovo-yoga-c630
+pkgdesc="Lenovo Yoga C630"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+# pmb:strict: avoid grub-related install error during build with pmbootstrap
+options="!check !archcheck pmb:strict"
+depends="postmarketos-base
+	linux-postmarketos-qcom-sdm845
+	soc-qcom-sdm845
+	systemd-boot
+	firmware-lenovo-yoga-c630
+	soc-qcom-sdm845-nonfree-firmware
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+c66907e00af107bb3130c48050e2209eb91213f5598b2ed92a828e678603b00d81fea776480041581f24a1d1c12a5b43bee7fa492068d1f1521440a0fb3aa195  deviceinfo
+490dd21b7775cea13e9dde9cb7568ddd204230fc786dad04dadee9b82b15749317fcf9c89286b4f73e8eeadd4bf19b5451f46d744d23f226d94e5bbbbc1692c3  modules-initfs
+"
diff --git a/device/testing/device-lenovo-yoga-c630/deviceinfo b/device/testing/device-lenovo-yoga-c630/deviceinfo
new file mode 100644
index 000000000..9c4750746
--- /dev/null
+++ b/device/testing/device-lenovo-yoga-c630/deviceinfo
@@ -0,0 +1,27 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Lenovo Yoga C630"
+deviceinfo_manufacturer="Lenovo"
+deviceinfo_codename="lenovo-yoga-c630"
+deviceinfo_arch="aarch64"
+deviceinfo_gpu_accelerated="true"
+
+deviceinfo_rootfs_image_sector_size="4096"
+
+# Device related
+deviceinfo_chassis="laptop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1920"
+deviceinfo_screen_height="1080"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_filesystem="fat32"
+deviceinfo_generate_systemd_boot="true"
+deviceinfo_dtb="qcom/sdm850-lenovo-yoga-c630"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200 console=tty0 clk_ignore_unused pd_ignore_unused arm64.nopauth"
+deviceinfo_getty="ttyMSM0;115200"
+
diff --git a/device/testing/device-lenovo-yoga-c630/modules-initfs b/device/testing/device-lenovo-yoga-c630/modules-initfs
new file mode 100644
index 000000000..adbd9755c
--- /dev/null
+++ b/device/testing/device-lenovo-yoga-c630/modules-initfs
@@ -0,0 +1,25 @@
+jbd2
+mbcache
+scsi_mod
+sd_mod
+sg
+libata
+sd
+ahci
+libahci
+hid-generic
+hid-multitouch
+i2c-qcom-geni
+i2c-hid
+i2c-hid-of
+usb_storage
+usb
+xhci_hcd
+ehci_hcd
+msm
+display-connector
+ti-sn65dsi86
+panel-edp
+phy-qcom-edp
+pwm_bl
+
diff --git a/device/testing/firmware-lenovo-yoga-c630/APKBUILD b/device/testing/firmware-lenovo-yoga-c630/APKBUILD
new file mode 100644
index 000000000..a512d30bc
--- /dev/null
+++ b/device/testing/firmware-lenovo-yoga-c630/APKBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+
+pkgname=firmware-lenovo-yoga-c630
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Lenovo Yoga C630"
+url="https://gitlab.com/sdm845-mainline/firmware-lenovo-yoga-c630"
+arch="aarch64"
+depends="linux-firmware-qcom linux-firmware-ath10k"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+
+_commit="6ddfd13d1bb0dcaf56dd0ffe9387f745a08eb80f"
+
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/firmware-lenovo-yoga-c630/-/archive/$_commit/$pkgname-$_commit.tar.gz
+	firmware.files"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	cd "$builddir"
+	for file in $(cat "$srcdir/firmware.files"); do
+		install -Dm644 "$file" "$pkgdir/$file"
+	done
+}
+
+sha512sums="
+c04d565c05c794c2da96cfbccb4ab9d4b406b8da34924901ab49002f6161c2c51e4cfc818f9cb0701ee0e7f4646280e4cc2fb441da3a0ff2514f5264934c2941  firmware-lenovo-yoga-c630-6ddfd13d1bb0dcaf56dd0ffe9387f745a08eb80f.tar.gz
+5b3d312ad96868893ed1faad822d66ecc723f5d803b0a94a42db7d53d228a4d86cc80c873e1a62bdca0c4ca371473703157ccbe1832abe28af90e5b3d1ec815f  firmware.files
+"
diff --git a/device/testing/firmware-lenovo-yoga-c630/firmware.files b/device/testing/firmware-lenovo-yoga-c630/firmware.files
new file mode 100644
index 000000000..6c654b65c
--- /dev/null
+++ b/device/testing/firmware-lenovo-yoga-c630/firmware.files
@@ -0,0 +1,18 @@
+./lib/firmware/postmarketos/qca/crbtfw21.tlv
+./lib/firmware/postmarketos/qca/crnv21.bin
+./lib/firmware/postmarketos/ipa_fws.mdt
+./lib/firmware/qcom/sdm850/LENOVO/81JL/adspr.jsn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/adspua.jsn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/cdspr.jsn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/modemuw.jsn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcadsp850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qccdsp850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcdsp1v2850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcdsp1v2850_nm.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcdsp2850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcdsp2850_nm.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcslpi850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcslpi850_cls.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/qcvss850.mbn
+./lib/firmware/qcom/sdm850/LENOVO/81JL/wlanmdsp.mbn