diff --git a/device/testing/device-google-sargo/APKBUILD b/device/testing/device-google-sargo/APKBUILD
index 532b902cb..37a3cad34 100644
--- a/device/testing/device-google-sargo/APKBUILD
+++ b/device/testing/device-google-sargo/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,6 +19,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,6 +29,14 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
+	depends="firmware-google-sargo linux-firmware-qca linux-firmware-qcom"
+
+	# Create an empty sub-package directory because this sub-package is empty
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 d300b755a4c07d3865a85599ad1f76fa00ce8bb2e6852a0d62ddec6b192537d1edad0a0b1b1e226c53f576aacd58ff5aaacaadf90dd033b38d2880d816a33cfc  deviceinfo
 "
diff --git a/device/testing/firmware-google-sargo/APKBUILD b/device/testing/firmware-google-sargo/APKBUILD
new file mode 100644
index 000000000..45ac9b13c
--- /dev/null
+++ b/device/testing/firmware-google-sargo/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Richard Acayan <mailingradian@gmail.com>
+pkgname=firmware-google-sargo
+pkgver=220505.008
+pkgrel=0
+pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
+url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
+arch="aarch64"
+license="proprietary"
+makedepends="pil-squasher"
+_commit="c631f0f2aa24ea60cfb505d327cd4ae56ca27f16"
+source="https://github.com/TheMuppets/proprietary_vendor_google_sargo/archive/$_commit.tar.gz"
+builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
+options="!check !archcheck !strip !tracedeps pmb:cross-native"
+
+build() {
+	pil-squasher a615_zap.mbn proprietary/vendor/firmware/a615_zap.mdt
+}
+
+package() {
+	install -Dm755 "$builddir"/a615_zap.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/a615_zap.mbn
+	install -Dm755 "$builddir"/proprietary/vendor/firmware/venus.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/venus.mbn
+}
+
+sha512sums="
+fbbb852405bd521efa4add32136b25f5d07b0671953b05ec66f7b04b6de483269b1e57500f1a723b6b00abb7b9b405e01d14552c686c5c6ffbdb4d0c14f98af0  c631f0f2aa24ea60cfb505d327cd4ae56ca27f16.tar.gz
+"