diff --git a/userpatches/targets-automation-nightly.blacklist b/userpatches/targets-automation-nightly.blacklist
index ec9dd767..f0932070 100644
--- a/userpatches/targets-automation-nightly.blacklist
+++ b/userpatches/targets-automation-nightly.blacklist
@@ -26,3 +26,5 @@ radxa-zero
 renegade
 tritium-h3
 tritium-h5
+uefi-arm64
+uefi-x86
\ No newline at end of file
diff --git a/userpatches/targets-release-nightly.template b/userpatches/targets-release-nightly.template
index a1d97af2..7a83f5a1 100644
--- a/userpatches/targets-release-nightly.template
+++ b/userpatches/targets-release-nightly.template
@@ -27,13 +27,41 @@ lists:
   virtual-boards: &virtual-boards
     # WSL2 UEFI's, for Windows WSL2 (mostly just interested in the kernel for those)
     # Qemu with u-boot
-    - { BOARD: wsl2-arm64, BRANCH: current }
-    - { BOARD: wsl2-x86, BRANCH: current }
+    #- { BOARD: wsl2-arm64, BRANCH: current }
+    #- { BOARD: wsl2-x86, BRANCH: current }
     - { BOARD: qemu-uboot-arm64, BRANCH: current }
     - { BOARD: qemu-uboot-x86, BRANCH: current }
 
 targets:
 
+  # ubuntu veryoldstable minimal
+  minimal-cli-veryoldstable-ubuntu:
+    enabled: yes
+    configs: [ armbian-images ]
+    pipeline:
+      gha: *armbian-gha
+      build-image: "yes"
+    vars:
+      RELEASE: focal
+      BUILD_MINIMAL: "yes"
+      BUILD_DESKTOP: "no"
+    items:
+      - *virtual-boards
+
+  # ubuntu oldstable minimal
+  minimal-cli-unstable-ubuntu:
+    enabled: yes
+    configs: [ armbian-images ]
+    pipeline:
+      gha: *armbian-gha
+      build-image: "yes"
+    vars:
+      RELEASE: jammy
+      BUILD_MINIMAL: "yes"
+      BUILD_DESKTOP: "no"
+    items:
+      - *virtual-boards
+
   # ubuntu stable minimal
   minimal-cli-unstable-ubuntu:
     enabled: yes
@@ -90,6 +118,20 @@ targets:
       - *staging-headless
       - *staging-riscv64
 
+  # debian oldstable minimal
+  minimal-cli-stable-debian:
+    enabled: yes
+    configs: [ armbian-images ]
+    pipeline:
+      gha: *armbian-gha
+      build-image: "yes"
+    vars:
+      RELEASE: bullseye
+      BUILD_MINIMAL: "yes"
+      BUILD_DESKTOP: "no"
+    items:
+      - *virtual-boards
+
   # debian stable minimal
   minimal-cli-stable-debian:
     enabled: yes
@@ -133,7 +175,7 @@ targets:
       gha: *armbian-gha
       build-image: "yes"
     vars:
-      RELEASE: jammy
+      RELEASE: noble
       BUILD_MINIMAL: "no"
       DESKTOP_ENVIRONMENT: "kde-neon"
       BUILD_DESKTOP: "yes"