diff --git a/device/testing/device-samsung-jackpotlte/APKBUILD b/device/testing/device-samsung-jackpotlte/APKBUILD
index 589c6d240d4e28cc29cc52ee713ed73ac4a183ae..18be53be8542244b2763a512cabf26c2296d5395 100644
--- a/device/testing/device-samsung-jackpotlte/APKBUILD
+++ b/device/testing/device-samsung-jackpotlte/APKBUILD
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="postmarketos-base linux-samsung-jackpotlte mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,4 +20,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Non-free firmware for the Samsung Galaxy A8 (2018)"
+	depends="firmware-samsung-universal7885"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="26194837ca66607030ad14654ab21fe373db8d068f8b0f1820fb3f1aa45a22590e06265abe6f478df50c78932a53a20c5b36f57986a442762d1cb0f07f920682  deviceinfo"
diff --git a/device/testing/firmware-samsung-universal7885/APKBUILD b/device/testing/firmware-samsung-universal7885/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..b051bd29b7a7a85f5b6150adc32f0cf51c81d9a9
--- /dev/null
+++ b/device/testing/firmware-samsung-universal7885/APKBUILD
@@ -0,0 +1,34 @@
+pkgname=firmware-samsung-universal7885
+pkgver=1
+pkgrel=0
+pkgdesc="WiFi firmware for the Samsung devices on Exynos7885 SOC (jackpotlte)"
+url="https://github.com/VDavid003/samsung_jackpotlte_dump"
+arch="noarch"
+license="proprietary"
+options="!check !archcheck"
+
+_commit="b3aaaa27f95f084cb1fdf4e566baca54c61c3754"
+_repo="https://github.com/VDavid003/samsung_jackpotlte_dump/raw/$_commit/system"
+
+_files_wifi="
+mx
+mx140.bin
+mx140_wlan.hcf
+"
+
+for _file in $_files_wifi; do
+	source="$source $pkgname-$_commit-$_file::$_repo/vendor/etc/wifi/$_file"
+done
+
+package() {
+	local file
+	for file in $_files_wifi; do
+		install -Dm644 "$srcdir/$pkgname-$_commit-$file" \
+			"$pkgdir/lib/firmware/postmarketos/mx140/$file"
+	done
+
+}
+
+sha512sums="cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e  firmware-samsung-universal7885-b3aaaa27f95f084cb1fdf4e566baca54c61c3754-mx
+b9ca23ef734eb43a7f0a533446525530ee63d76c03bff22b938ab2f18163653f1879e6eebf98239fbf4c2df06eb7fafc87040299a61009849f8c2e0a01bd57c7  firmware-samsung-universal7885-b3aaaa27f95f084cb1fdf4e566baca54c61c3754-mx140.bin
+67527efc8761cc227bf0ebd1726c83fa8c7fbf912c51130eab8f4ed2bf90208b1f392c6fbc0ca1cb4ee60c62405d9e6ff73820b59f5c48a03b27947288999ac5  firmware-samsung-universal7885-b3aaaa27f95f084cb1fdf4e566baca54c61c3754-mx140_wlan.hcf"
diff --git a/device/testing/linux-samsung-jackpotlte/APKBUILD b/device/testing/linux-samsung-jackpotlte/APKBUILD
index 72283e14397b66b61f0c77b5e8a1c9e6ae32a7a3..94c381e6819cce9538a005422d1da0c9778e3f71 100644
--- a/device/testing/linux-samsung-jackpotlte/APKBUILD
+++ b/device/testing/linux-samsung-jackpotlte/APKBUILD
@@ -15,7 +15,7 @@ makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool-exynos"
 
 # Source
 _repository="Universal7885_native_linux"
-_commit="8ab619fec5ab7fadc8dfb2cf8e994d4a89b212c3"
+_commit="494009fa0b85ef8c6cc8678da8d9c85014c17205"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/VDavid003/$_repository/archive/$_commit.tar.gz
@@ -52,6 +52,6 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="2ed2ec274982a52736942fd88dc79e57fefa17151460c2d143d6eef5511fc018fc9d498d972e770350b454c206ea11c0d5b84d8a8a22218f684fa3c70ff238eb  linux-samsung-jackpotlte-8ab619fec5ab7fadc8dfb2cf8e994d4a89b212c3.tar.gz
+sha512sums="63d0a2161f926999b32cbb8eb69dbe69864752f53619d4f046181f5187bb57bd3f0b11ac46dd469c8596efd075d2a422db4bc3fc94e07785ed61c8cbb3b9d6b0  linux-samsung-jackpotlte-494009fa0b85ef8c6cc8678da8d9c85014c17205.tar.gz
 f3161f62a6ba0de56342b1410e509dce8320e43f788ae2670ebd59d93e5504aab77a913eecdebae33ff9135228869c5fd0559211c511f503fdc25f2fbab48351  kernel-define-android-version.patch
-d97a6b08b432d71ed2dd26fc2a82f7fcaa5a53ab15fdc5c05d0722231c6143f88b83e2d883b4fec4d97643f032fefffaf62c1fa0d9ef7b4d7a490cb325a2c087  config-samsung-jackpotlte.aarch64"
+199f3f82c2c85ad3689a37f311267a956d8fe5ad0d70e26feb869278e3d159699530f943541694ab70478169d4657aa1ec67c86616cc5692674943d0e3955acc  config-samsung-jackpotlte.aarch64"
diff --git a/device/testing/linux-samsung-jackpotlte/config-samsung-jackpotlte.aarch64 b/device/testing/linux-samsung-jackpotlte/config-samsung-jackpotlte.aarch64
index 02da3702eb17d98d9c9650a85bc54af82b90f5a3..3fe5adc9e187126a8a11196d6aeb91e308b8e654 100644
--- a/device/testing/linux-samsung-jackpotlte/config-samsung-jackpotlte.aarch64
+++ b/device/testing/linux-samsung-jackpotlte/config-samsung-jackpotlte.aarch64
@@ -1332,7 +1332,7 @@ CONFIG_GNSS_SHMEM_IF=y
 # CONFIG_GPIO_DEBUG is not set
 CONFIG_SCSC_CORE_CM=y
 CONFIG_SCSC_CORE=y
-CONFIG_SCSC_CORE_FW_LOCATION="/system/etc/wifi"
+CONFIG_SCSC_CORE_FW_LOCATION="/lib/firmware/postmarketos/mx140"
 CONFIG_SCSC_CORE_FW_LOCATION_AUTO="y"
 CONFIG_SCSC_CORE_TOOL_LOCATION="/system/bin"
 CONFIG_SCSC_WLBT_CONFIG_PLATFORM=""