diff --git a/.github/workflows/build-stable-images.yml b/.github/workflows/build-stable-images.yml
index 4a4cad39a..4b63a98be 100644
--- a/.github/workflows/build-stable-images.yml
+++ b/.github/workflows/build-stable-images.yml
@@ -99,7 +99,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -209,7 +209,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -319,7 +319,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -429,7 +429,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -539,7 +539,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -649,7 +649,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -759,7 +759,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -869,7 +869,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -979,7 +979,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1089,7 +1089,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1199,7 +1199,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1309,7 +1309,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1419,7 +1419,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1529,7 +1529,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1639,7 +1639,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1749,7 +1749,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1859,7 +1859,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -1969,7 +1969,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2079,7 +2079,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2189,7 +2189,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2299,7 +2299,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2409,7 +2409,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2519,7 +2519,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2629,7 +2629,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2739,7 +2739,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2849,7 +2849,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -2959,7 +2959,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3069,7 +3069,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3179,7 +3179,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3289,7 +3289,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3399,7 +3399,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3509,7 +3509,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3619,7 +3619,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3729,7 +3729,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3839,7 +3839,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -3949,7 +3949,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -4059,7 +4059,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -4169,7 +4169,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -4279,7 +4279,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf
@@ -4389,7 +4389,7 @@ jobs:
             PARALLEL_BUILDS=$(awk '{printf("%d",$1/8000)}' <<<$(($(LC_ALL=C free -w 2>/dev/null | grep "^Mem" | awk '{print $2}' || LC_ALL=C free | grep "^Mem"| awk '{print $2}')/1024)))
 
             # cleaning leftovers if any
-            rm -rf output/images/* output/debs-beta/* output/debs/*
+            rm -rf output/images/*
 
             # split into 40 build chunks
             cat config/targets.conf | grep -v "^$" | grep -v "^#"  > userpatches/split.conf