diff --git a/config/targets.conf b/config/targets.conf
index 36dfba4bcb..2f0001881a 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -6,18 +6,16 @@
 bananapi            current         buster      cli                      stable         yes
 bananapi            current         buster      desktop                  stable         yes            xfce    config_base   browsers
 bananapi            current         focal       cli                      stable         yes
-bananapi            current         focal       desktop                  stable         yes            xfce    config_base   browsers
 bananapi            current         buster      minimal                  stable         yes
 bananapi            current         focal       minimal                  stable         yes
 bananapi            legacy          buster      cli                      stable         no
-bananapi            dev             hirsute     cli                      stable         no
+bananapi            dev             focal       cli                      stable         no
 
 
 # Bananapi Pro A20
 bananapi            current         buster      cli                      stable         yes
 bananapi            current         buster      desktop                  stable         yes            xfce    config_base   browsers
 bananapi            current         focal       cli                      stable         yes
-bananapi            current         focal       desktop                  stable         yes            xfce    config_base   browsers
 bananapi            current         buster      minimal                  stable         yes
 bananapi            current         focal       minimal                  stable         yes
 bananapi            legacy          buster      cli                      stable         no
@@ -27,7 +25,6 @@ bananapi            legacy          buster      cli                      stable
 bananapim2plus      current         buster      cli                      stable         yes
 bananapim2plus      current         buster      desktop                  stable         yes            xfce    config_base   browsers
 bananapim2plus      current         focal       cli                      stable         yes
-bananapim2plus      current         focal       desktop                  stable         yes            xfce    config_base   browsers
 bananapim2plus      current         buster      minimal                  stable         yes
 bananapim2plus      current         focal       minimal                  stable         yes
 bananapim2plus      legacy          buster      cli                      stable         no
@@ -54,8 +51,8 @@ bananapim3          current         focal       cli                      stable
 # Bananapi M64
 bananapim64         current         buster      cli                      stable         yes
 bananapim64         current         focal       cli                      stable         yes
-bananapim64         dev             hirsute     cli                      stable         no
 bananapim64         current         focal       desktop                  stable         yes            gnome   config_base   browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
+bananapim64         dev             buster      cli                      stable         no
 
 
 # Bananapi R2
@@ -93,14 +90,12 @@ cubieboard          current         focal       cli                      stable
 cubieboard2         current         buster      cli                      stable         yes
 cubieboard2         current         buster      desktop                  stable         yes            xfce    config_base   browsers
 cubieboard2         current         focal       cli                      stable         yes
-cubieboard2         current         focal       desktop                  stable         yes            xfce    config_base   browsers
 
 
 # Cubietruck
 cubietruck          current         buster      cli                      stable         yes
 cubietruck          current         buster      desktop                  stable         yes            xfce    config_base   browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
 cubietruck          current         focal       cli                      stable         yes
-cubietruck          current         focal       desktop                  stable         yes            xfce    config_base   browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
 
 
 # Cubox-i
@@ -113,7 +108,7 @@ cubox-i             current         focal       desktop                  stable
 # Espressobin
 espressobin         current         buster      cli                      stable         yes
 espressobin         current         focal       cli                      stable         yes
-espressobin         dev             hirsute     cli                      stable         no
+espressobin         dev             buster      cli                      stable         no
 
 
 # Firefly rk3399
@@ -399,7 +394,6 @@ odroidxu4           legacy          buster      desktop                  stable
 odroidxu4           legacy          focal       cli                      stable         yes
 odroidxu4           legacy          focal       desktop                  stable         yes            xfce    config_base   browsers
 odroidxu4           current         focal       cli                      stable         yes
-odroidxu4           current         focal       desktop                  stable         yes
 odroidxu4           dev             hirsute     cli                      stable         no
 
 
@@ -728,7 +722,7 @@ udoo                current         focal       desktop                  stable
 
 # xt-q8l-v10
 xt-q8l-v10          current         buster      desktop                  stable         yes            xfce    config_base   browsers
-xt-q8l-v10          current         bionic      desktop                  stable         yes            xfce    config_base   browsers
+xt-q8l-v10          current         focal       desktop                  stable         yes            xfce    config_base   browsers
 xt-q8l-v10          current         buster      minimal                  stable         yes
 xt-q8l-v10          current         focal       cli                      stable         yes