diff --git a/device/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD
index ee1dcfce1..9924fa39d 100644
--- a/device/device-samsung-i9070/APKBUILD
+++ b/device/device-samsung-i9070/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9070"
+depends="linux-samsung-i9070 firmware-samsung-i9070"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/linux-samsung-i9070/APKBUILD b/device/linux-samsung-i9070/APKBUILD
index 38b944fff..4d63aa981 100644
--- a/device/linux-samsung-i9070/APKBUILD
+++ b/device/linux-samsung-i9070/APKBUILD
@@ -18,10 +18,7 @@
 _vendor=samsung
 _flavor=samsung-i9070
 _hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332"
-_hash_vendor_files="e24d9687e7fda4f94fc6652d137ed8e703930c3a"
 _config="config-${_flavor}.armhf"
-_src_tgz="linux-${_flavor}-${_hash}.tar.gz"
-_vendor_files_tgz="vendor-files-${_flavor}-${_hash_vendor_files}.tar.gz"
 
 pkgname=linux-${_flavor}
 pkgver=3.0.101
@@ -29,7 +26,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="Samsung Galaxy S Advance kernel from Epirex"
 url="https://github.com/Epirex/Samsung_STE_Kernel"
@@ -38,8 +35,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev b
 options="!strip !check !tracedeps"
 install=
 source="
-	$_src_tgz::https://github.com/Epirex/Samsung_STE_Kernel/archive/${_hash}.tar.gz
-	$_vendor_files_tgz::https://github.com/Epirex/android_vendor_samsung_u8500/archive/${_hash_vendor_files}.tar.gz
+	$pkgname-$_hash.tar.gz::https://github.com/Epirex/Samsung_STE_Kernel/archive/${_hash}.tar.gz
 	$_config
 	00_fix_return_address.patch
 	01_remove_ramdisks_from_initramfs.patch
@@ -58,7 +54,6 @@ HOSTCC="${CC:-gcc}"
 HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
 
 ksrcdir="$srcdir/Samsung_STE_Kernel-${_hash}"
-vsrcdir="$srcdir/android_vendor_samsung_u8500-${_hash_vendor_files}"
 
 prepare() {
 	local _patch_failed=
@@ -142,17 +137,9 @@ package() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
 		INSTALL_MOD_PATH="$pkgdir" modules_install \
 		|| return 1
-
-	echo "--[ Installing vendor files ]--"
-	# install wifi firmware
-	install -Dm644 "$vsrcdir/janice/system/etc/wifi/bcmdhd_sta.bin" \
-		"$pkgdir/lib/firmware/postmarketos/bcmdhd_sta.bin"
-	install -Dm644 "$vsrcdir/janice/system/etc/wifi/nvram_net.txt" \
-		"$pkgdir/lib/firmware/postmarketos/nvram_net.txt"
 }
 
 sha512sums="5e9309a4329280f0cfbac6e5aae6465143a36197217ea72957e624b06ff724f4117b1309c5a535432ef008733723a605c90285d5740f7b798becd0130f2c0996  linux-samsung-i9070-ac7219c4b8dcec7bc5a598d42c6be0db4aa36332.tar.gz
-8cb497e9403f5b9e39ad1725959c45f9bbeeb3331f0ddcb4f201f17fbe315b5b8cc5e62ca17179e4da24766697dc7ca8a1bf8f7c06552ca8dce69673f280399a  vendor-files-samsung-i9070-e24d9687e7fda4f94fc6652d137ed8e703930c3a.tar.gz
 65ac788fc01180b803d8110333cbd0e30e742801647d6d4d813aaa6eca0c3d216f5daef0fc9583aef5a1ea2475d48567896da8e443781a1f08ff10ff8d6ea0a6  config-samsung-i9070.armhf
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 c8f12ecf578be0c4600563134079b980a1079b08ac868302af8821022befe873aa94c67b9690ba87f5967f0a48939d15e871dc2d2862bed7b6a1d0c9a95cfd8f  01_remove_ramdisks_from_initramfs.patch
diff --git a/firmware/firmware-mozilla-flame/APKBUILD b/firmware/firmware-mozilla-flame/APKBUILD
index 13d1f505a..70603b5aa 100644
--- a/firmware/firmware-mozilla-flame/APKBUILD
+++ b/firmware/firmware-mozilla-flame/APKBUILD
@@ -1,17 +1,17 @@
 pkgname=firmware-mozilla-flame
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Flame Firmware"
 url="https://github.com/yuvadm/mozilla-flame-firmware"
-arch="armhf"
+arch="noarch"
 license="proprietary"
 depends=""
 makedepends=""
 install=""
 subpackages=""
 _hash=503a4052a8bfdc3b4c06533f2d08fe4d6a923842
-source=$pkgname-$_hash.zip::$url"/archive/${_hash}.zip"
-options="!check !strip"
+source=$pkgname-$_hash.tar.gz::$url"/archive/${_hash}.tar.gz"
+options="!check !strip !archcheck"
 
 package() {
 	mkdir -p "$pkgdir/lib/firmware/postmarketos"
@@ -21,4 +21,4 @@ package() {
 	done
 }
 
-sha512sums="dc9253f5891a488874879fbe94d9d3e59807f33c91958d9b93fc0b07fe31ca664b9929a98857831be07900280ce4c04c4231ab3951e4f02f81b66dd034354560  firmware-mozilla-flame-503a4052a8bfdc3b4c06533f2d08fe4d6a923842.zip"
+sha512sums="865c6cb88d44c5305b088db4d244f9e178f2ddd7550c481aadeb6444fd853e004641b8900172ec326a11037aa170a658d32d9e62d0780ee50838e89983178384  firmware-mozilla-flame-503a4052a8bfdc3b4c06533f2d08fe4d6a923842.tar.gz"
diff --git a/firmware/firmware-samsung-i9070/APKBUILD b/firmware/firmware-samsung-i9070/APKBUILD
new file mode 100644
index 000000000..88b1952b7
--- /dev/null
+++ b/firmware/firmware-samsung-i9070/APKBUILD
@@ -0,0 +1,28 @@
+pkgname=firmware-samsung-i9070
+pkgver=1
+pkgrel=0
+pkgdesc="Samsung Galaxy S Advance Firmware"
+url="https://github.com/Epirex/android_vendor_samsung_u8500"
+arch="noarch"
+license="proprietary"
+depends=""
+makedepends=""
+install=""
+subpackages=""
+_hash="e24d9687e7fda4f94fc6652d137ed8e703930c3a"
+source=$pkgname-$_hash.tar.gz::$url"/archive/${_hash}.tar.gz"
+options="!check !strip"
+
+vsrcdir="$srcdir/android_vendor_samsung_u8500-${_hash}"
+
+package() {
+	mkdir -p "$pkgdir/lib/firmware/postmarketos"
+
+	# install wifi firmware
+	install -Dm644 "$vsrcdir/janice/system/etc/wifi/bcmdhd_sta.bin" \
+		"$pkgdir/lib/firmware/postmarketos/bcmdhd_sta.bin"
+	install -Dm644 "$vsrcdir/janice/system/etc/wifi/nvram_net.txt" \
+		"$pkgdir/lib/firmware/postmarketos/nvram_net.txt"
+}
+
+sha512sums="8cb497e9403f5b9e39ad1725959c45f9bbeeb3331f0ddcb4f201f17fbe315b5b8cc5e62ca17179e4da24766697dc7ca8a1bf8f7c06552ca8dce69673f280399a  firmware-samsung-i9070-e24d9687e7fda4f94fc6652d137ed8e703930c3a.tar.gz"