diff --git a/config/targets.conf b/config/targets.conf
index c68ecfe34d..84e1d4b453 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -232,7 +232,8 @@ nanopct4			legacy			bionic		desktop			stable	yes
 nanopct4			current			buster		cli			stable	yes
 nanopct4			current			buster		desktop			stable	yes
 nanopct4			current			bionic		cli			stable	yes
-nanopct4			current			focal		cli			stable	no
+nanopct4			current			focal		cli			stable	yes
+nanopct4			current			focal		desktop			stable	yes
 
 # nanopi-r1
 
@@ -301,7 +302,7 @@ nanopik2-s905			current			buster		minimal			stable	yes
 nanopik2-s905			current			stretch		cli			stable	yes
 nanopik2-s905			current			bionic		desktop			stable	yes
 nanopik2-s905			current			bullseye	minimal			stable	yes
-nanopik2-s905			current			focal		minimal			stable	yes
+nanopik2-s905			current			focal		cli			stable	yes
 nanopik2-s905			current			focal		desktop			stable	yes
 
 # nanopim1
@@ -346,6 +347,7 @@ nanopim4			current			buster		desktop			stable	yes
 nanopim4			current			bionic		cli			stable	yes
 nanopim4			current			bullseye	cli			stable	yes
 nanopim4			current			focal		cli			stable	yes
+nanopim4			current			focal		desktop			stable	yes
 
 # nanopim4v2
 
@@ -355,7 +357,7 @@ nanopim4v2			legacy			bionic		desktop			stable	yes
 nanopim4v2			current			buster		cli			stable	yes
 nanopim4v2			current			buster		desktop			stable	yes
 nanopim4v2			current			bionic		cli			stable	yes
-nanopim4v2			current			bullseye		cli			stable	yes
+nanopim4v2			current			bullseye	cli			stable	yes
 nanopim4v2			current			focal		cli			stable	yes
 nanopim4v2			current			focal		desktop			stable	yes
 
@@ -393,6 +395,7 @@ nanopineo4			current			buster		desktop			stable	yes
 nanopineo4			current			bionic		cli			stable	yes
 nanopineo4			current			bullseye	cli			stable	yes
 nanopineo4			current			focal		cli			stable	yes
+nanopineo4			current			focal		desktop			stable	yes
 
 # nanopineocore2
 
@@ -529,6 +532,7 @@ firefly-rk3399			current			buster		desktop			stable	yes
 firefly-rk3399			current			bionic		minimal			stable	yes
 firefly-rk3399			current			bullseye	cli			stable	yes
 firefly-rk3399			current			focal		cli			stable	yes
+firefly-rk3399			current			focal		desktop			stable	yes
 
 # orangepilite
 
@@ -729,6 +733,7 @@ renegade			legacy			buster		cli			stable	yes
 renegade			current			buster		cli			stable	yes
 renegade			legacy			focal		cli			stable	yes
 renegade			current			focal		cli			stable	yes
+renegade			current			focal		desktop			stable	yes
 renegade			legacy			bionic		desktop			stable	yes
 renegade			current			bionic		desktop			stable	yes