diff --git a/VERSION b/VERSION
index 388d7b763..f4594fa64 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-19.11.4
+19.11.5
diff --git a/config/targets.conf b/config/targets.conf
index 60f2ca7ae..6e1ec5393 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -176,11 +176,11 @@ nanopct3plus			legacy			bionic		minimal			stable	yes
 # nanopct4
 
 nanopct4			legacy			buster		cli			stable	yes
-nanopct4			legacy			buster		minimal			stable	yes
 nanopct4			legacy			buster		desktop			stable	yes
 nanopct4			legacy			bionic		desktop			stable	yes
+nanopct4			current			buster		cli			stable	yes
 nanopct4			current			buster		desktop			stable	yes
-nanopct4			dev			buster		minimal			beta	yes
+nanopct4			current			bionic		cli			stable	yes
 
 # nanopi-r1
 
@@ -256,11 +256,11 @@ nanopim3			legacy			bionic		desktop			stable	yes
 # nanopim4
 
 nanopim4			legacy			buster		cli			stable	yes
-nanopim4			legacy			buster		minimal			stable	yes
 nanopim4			legacy			buster		desktop			stable	yes
 nanopim4			legacy			bionic		desktop			stable	yes
+nanopim4			current			buster		cli			stable	yes
 nanopim4			current			buster		desktop			stable	yes
-nanopim4			dev			buster		minimal			beta	yes
+nanopim4			current			bionic		cli			stable	yes
 
 # nanopim4v2
 
@@ -269,7 +269,7 @@ nanopim4v2			legacy			buster		desktop			stable	yes
 nanopim4v2			legacy			bionic		desktop			stable	yes
 nanopim4v2			current			buster		cli			stable	yes
 nanopim4v2			current			buster		desktop			stable	yes
-nanopim4v2			dev			buster		minimal			beta	yes
+nanopim4v2			current			bionic		cli			stable	yes
 
 # nanopineo
 
@@ -299,10 +299,9 @@ nanopineo2black			dev			buster		minimal			beta	yes
 
 nanopineo4			legacy			buster		cli			stable	yes
 nanopineo4			legacy			buster		minimal			stable	yes
-nanopineo4			legacy			buster		desktop			stable	yes
 nanopineo4			legacy			bionic		desktop			stable	yes
 nanopineo4			current			buster		desktop			stable	yes
-nanopineo4			dev			buster		minimal			beta	yes
+nanopineo4			current			bionic		cli			stable	yes
 
 # nanopineocore2
 
@@ -362,7 +361,7 @@ orangepi2			dev			buster		minimal			beta	yes
 orangepi3			current			buster		cli			stable	yes
 orangepi3			current			stretch		cli			stable	yes
 orangepi3			current			bionic		desktop			stable	yes
-orangepi3			dev			buster		minimal			beta	yes
+orangepi3			current			bullseye	cli			stable	yes
 
 # orangepi-r1
 
@@ -384,8 +383,8 @@ orangepi-rk3399			dev			buster		minimal			beta	yes
 firefly-rk3399			legacy			buster		cli			stable	yes
 firefly-rk3399			legacy			bullseye	cli			stable	yes
 firefly-rk3399			legacy			bionic		desktop			stable	yes
-firefly-rk3399			legacy			buster		desktop			stable	yes
-firefly-rk3399			dev			buster		minimal			beta	yes
+firefly-rk3399			current			buster		desktop			stable	yes
+firefly-rk3399			current			bionic		minimal			stable	yes
 
 # orangepilite
 
diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh
index 2e1edd723..7e6e0e67a 100644
--- a/lib/build-all-ng.sh
+++ b/lib/build-all-ng.sh
@@ -33,11 +33,11 @@ mkdir -p /run/armbian
 if [[ -f $USERPATCHES_PATH/targets.conf ]]; then
 
 	display_alert "Adding user provided targets configuration"
-	TARGETS="${USERPATCHES_PATH}/targets.conf"
+	BUILD_TARGETS="${USERPATCHES_PATH}/targets.conf"
 
 else
 
-	TARGETS="${SRC}/config/targets.conf"
+	BUILD_TARGETS="${SRC}/config/targets.conf"
 
 fi
 
@@ -254,7 +254,7 @@ function build_all()
 
 							while :
 							do
-							if [[ $(find /run/armbian/*.pid 2>/dev/null | wc -l) -le ${MULTITHREAD} ]]; then
+							if [[ $(find /run/armbian/*.pid 2>/dev/null | wc -l) -le ${MULTITHREAD} || -z ${MULTITHREAD} ]]; then
 								break
 							fi
 							sleep 5
@@ -299,7 +299,7 @@ function build_all()
 
 		fi
 
-	done < ${TARGETS}
+	done < ${BUILD_TARGETS}
 
 }