diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
index f898776..973cb5b 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
@@ -99,24 +99,17 @@ function launch_tests_up_until_magnet {
 	echo "	OK"
 	sync
 
-	## Check if battery present
-	if [[ $(cat /sys/class/power_supply/axp20x-battery/present) == "0" ]]; then
-
-		## Launch screen to wait for battery
-		echo "TEST BATTERY:" 
-		sync
-		$PROD_SCREEN_BIN WAIT_BATTERY  2>&1
-		res="$?"
-		echo "	$res" 
-		if [[ "$res" == "0" ]]; then
-			echo "	OK" 
-		else
-			echo "	FAIL" 
-			test_failed=true
-		fi
-	else
-		echo "TEST BATTERY:" 
+	## Battery tests
+	echo "TEST BATTERY:" 
+	sync
+	$PROD_SCREEN_BIN WAIT_BATTERY  2>&1
+	res="$?"
+	echo "	$res" 
+	if [[ "$res" == "0" ]]; then
 		echo "	OK" 
+	else
+		echo "	FAIL" 
+		test_failed=true
 	fi
 	sync
 
diff --git a/FunKey/package/ProdScreens/ProdScreens.mk b/FunKey/package/ProdScreens/ProdScreens.mk
index 0c7267a..b8ba6a5 100644
--- a/FunKey/package/ProdScreens/ProdScreens.mk
+++ b/FunKey/package/ProdScreens/ProdScreens.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-1.1.1
+PRODSCREENS_VERSION = 428290b
 PRODSCREENS_SITE_METHOD = git
 PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git
 PRODSCREENS_SITE_LICENSE = GPL-2.1+