diff --git a/device/testing/device-samsung-golden/APKBUILD b/device/testing/device-samsung-golden/APKBUILD
index 6cb0eff6b..a96b0cbe8 100644
--- a/device/testing/device-samsung-golden/APKBUILD
+++ b/device/testing/device-samsung-golden/APKBUILD
@@ -13,6 +13,7 @@ subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-kwin
 "
 source="
 	deviceinfo
@@ -50,9 +51,6 @@ kernel_mainline() {
 	pkgdesc="Close to mainline kernel"
 	depends="linux-postmarketos-stericsson mesa-git-dri-gallium"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	# Plasma Mobile
-	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
 }
 
 nonfree_firmware() {
@@ -61,6 +59,11 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+kwin() {
+	install_if="$pkgname-kernel-mainline kwin"
+	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
+}
+
 sha512sums="93462211fc2f425c1b7cc50a8289568f8c1aa538a4805551a47a33c25f15f6fb4b874a53c1a5be238c5ea90a3e6621b2e9c39aba9b871277f1ee8f181741dea2  deviceinfo
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh
 769f76b2b0dc5279c514181f6cc915c045562df0c1fe08c54b6588d11ff2c75441a3a4f78d6dde669c82e1c572a66bdde475da3e289d334e3255fcf15430c044  init-usb-hook.sh
diff --git a/device/testing/device-samsung-skomer/APKBUILD b/device/testing/device-samsung-skomer/APKBUILD
new file mode 100644
index 000000000..43e7a2a7c
--- /dev/null
+++ b/device/testing/device-samsung-skomer/APKBUILD
@@ -0,0 +1,41 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-skomer
+pkgdesc="Samsung Galaxy Xcover 2"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="postmarketos-base mkbootimg linux-postmarketos-stericsson mesa-git-dri-gallium"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-kwin
+"
+source="
+	deviceinfo
+	kwin.sh
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="firmware-samsung-u8500"
+	mkdir "$subpkgdir"
+}
+
+kwin() {
+	install_if="$pkgname kwin"
+	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
+}
+
+sha512sums="d69eff3bedb8ceff62df8141de80b63d714a3f24de67a318e73d41ff2b859c13724e78f7db1a0c9b9afd272b6df24ad3c166430d516958c9efc1e9a903635555  deviceinfo
+685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh"
diff --git a/device/testing/device-samsung-skomer/deviceinfo b/device/testing/device-samsung-skomer/deviceinfo
new file mode 100644
index 000000000..5d8a0da13
--- /dev/null
+++ b/device/testing/device-samsung-skomer/deviceinfo
@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Samsung Galaxy Xcover 2"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-skomer"
+deviceinfo_year="2013"
+deviceinfo_dtb_mainline="ste-ux500-samsung-skomer"
+deviceinfo_modules_initfs=""
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="480"
+deviceinfo_screen_height="800"
+deviceinfo_getty="ttyAMA2;115200"
+
+deviceinfo_kernel_cmdline_mainline="console=ttyAMA2,115200 PMOS_NO_OUTPUT_REDIRECT"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_dtb_second_mainline="true"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
diff --git a/device/testing/device-samsung-skomer/kwin.sh b/device/testing/device-samsung-skomer/kwin.sh
new file mode 100644
index 000000000..64673d012
--- /dev/null
+++ b/device/testing/device-samsung-skomer/kwin.sh
@@ -0,0 +1 @@
+export KWIN_DRM_DEVICE_NODE=/dev/dri/card1
diff --git a/device/testing/firmware-samsung-u8500/APKBUILD b/device/testing/firmware-samsung-u8500/APKBUILD
index cee67d233..85c55d602 100644
--- a/device/testing/firmware-samsung-u8500/APKBUILD
+++ b/device/testing/firmware-samsung-u8500/APKBUILD
@@ -21,7 +21,7 @@ package() {
 		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.bin
 	install -Dm644 nvram_net.txt_GPIO4 \
 		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,golden.txt
-	install -Dm644 nvram_net-skomer.txt \
+	install -Dm644 nvram_net-skomer-$_skomer_commit.txt \
 		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,skomer.txt
 
 	# Bluetooth