diff --git a/config/boards/cubox-i.conf b/config/boards/cubox-i.csc
similarity index 100%
rename from config/boards/cubox-i.conf
rename to config/boards/cubox-i.csc
diff --git a/config/boards/fe-som-rk3399.csc b/config/boards/fe-som-rk3399.eos
similarity index 100%
rename from config/boards/fe-som-rk3399.csc
rename to config/boards/fe-som-rk3399.eos
diff --git a/config/boards/pinebook-a64.conf b/config/boards/pinebook-a64.csc
similarity index 100%
rename from config/boards/pinebook-a64.conf
rename to config/boards/pinebook-a64.csc
diff --git a/config/boards/uefi-arm64.wip b/config/boards/uefi-arm64.conf
similarity index 100%
rename from config/boards/uefi-arm64.wip
rename to config/boards/uefi-arm64.conf
diff --git a/config/boards/uefi-x86.wip b/config/boards/uefi-x86.conf
similarity index 100%
rename from config/boards/uefi-x86.wip
rename to config/boards/uefi-x86.conf
diff --git a/config/targets-cli-beta.conf b/config/targets-cli-beta.conf
index be163b2605..e6c9b386c4 100644
--- a/config/targets-cli-beta.conf
+++ b/config/targets-cli-beta.conf
@@ -2,14 +2,6 @@
 # board                      branch          release      desktop|cli|minimal      stable|beta  create images      #
 ####################################################################################################################
 
-# nanopi-r2s
-nanopi-r2s                   edge            jammy       cli                      beta         yes
-
-
-# nanopi-r4s
-nanopi-r4s                   edge            jammy       cli                      beta         yes
-
-
 # Orangepi R1+
 orangepi-r1plus              edge            jammy       cli                      beta         yes
 
@@ -30,19 +22,10 @@ orangepizero2                edge            jammy       cli
 quartz64a                    edge            jammy       cli                      beta         yes
 
 
-# radxa-zero
-radxa-zero                   edge            jammy       cli                      beta         yes
-
-
 # radxa-zero
 radxa-zero2                  current         jammy       cli                      beta         yes
 
 
-# Radxa rock-3a
-rock-3a                      legacy          jammy       cli                      beta         yes
-rock-3a                      edge            jammy       cli                      beta         yes
-
-
 # Radxa rock-5b
 rock-5b                      legacy          jammy       cli                      beta         yes
 
@@ -51,10 +34,6 @@ rock-5b                      legacy          jammy       cli
 rockpi-s                     current         jammy       cli                      beta         yes
 
 
-# Raspberry Pi4
-rpi4b                        edge            jammy       cli                      beta         yes
-
-
 # Tinkerboard 2
 tinkerboard-2                edge            jammy       cli                      beta         yes
 
diff --git a/config/targets-desktop-beta.conf b/config/targets-desktop-beta.conf
index 6de13685a7..f19b73fb5d 100644
--- a/config/targets-desktop-beta.conf
+++ b/config/targets-desktop-beta.conf
@@ -3,22 +3,10 @@
 ###########################################################################################################################################################
 
 
-# Orangepi 4 LTS
-orangepi4-lts       edge            jammy        desktop                  beta            yes           xfce          config_base   3dsupport,browsers
-
-
-# Raspberry Pi4
-rpi4b               current         jammy        desktop                  beta            adv           xfce          config_base   3dsupport,browsers
-
-
 # Radxa rock-5b
 rock-5b             legacy          jammy        desktop                  beta            adv           xfce          config_base   3dsupport,browsers
 
 
-# tinkerboard-2
-tinkerboard-2       edge            jammy        desktop                  beta            yes           xfce          config_base   3dsupport,browsers
-
-
 # uefi-x86
 uefi-x86            edge            jammy        desktop                  beta            yes           xfce          config_base   3dsupport,browsers
 
@@ -28,8 +16,4 @@ uefi-arm64          edge            jammy        desktop                  beta
 
 
 # qemu virtual images
-virtual-qemu        current         jammy        desktop                  beta            yes           gnome         config_base   3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
-virtual-qemu        current         jammy        desktop                  beta            yes           budgie        config_base   3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
-virtual-qemu        current         jammy        desktop                  beta            yes           cinnamon      config_base   3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
-virtual-qemu        current         jammy        desktop                  beta            adv           xfce          config_base   3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
-virtual-qemu        current         jammy        desktop                  beta            yes           kde-plasma    config_base   3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
+virtual-qemu        current         jammy        desktop                  beta            adv           xfce          config_base   3dsupport,browsers