diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml
index 553b5268a7..558b75f490 100644
--- a/.github/workflows/build-test-image-docker.yml
+++ b/.github/workflows/build-test-image-docker.yml
@@ -1,4 +1,4 @@
-name: Build With Docker Image
+name: Build test with Docker
 on:
   
   # Trigger after Docker image was built
@@ -19,8 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        board: [uefi-arm64,uefi-x86,virtual-qemu]
         release: [focal,buster,bullseye,hirsute,jammy]
-        branch: [current]
+        desktop: [xfce]
     if: ${{ github.repository_owner == 'Armbian' }}
     name: Variant
     runs-on: ubuntu-latest    
@@ -53,7 +54,7 @@ jobs:
 
           sudo docker pull ghcr.io/armbian/build:$(cat build/VERSION)
 
-      - name: Build Qemu virtual image
+      - name: Build test image
         run: |
 
           cd build
@@ -78,12 +79,29 @@ jobs:
           mkdir -p cache/toolchain/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf
           touch cache/toolchain/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf/.download-complete
 
-          sed -i "s/-it --rm/-i --rm/" userpatches/config-docker.conf
+          export TERM=dumb
+          sed -i "s/-it --rm/-i --rm/" userpatches/config-docker.conf          
           sed -i "s/COMPRESS_OUTPUTIMAGE=.*/COMPRESS_OUTPUTIMAGE=\"no\"/" userpatches/lib.config
-          ./compile.sh docker BETA=yes EXPERT=yes BOARD=virtual-qemu BRANCH=${{ matrix.branch }} RELEASE=${{ matrix.release }} BUILD_MINIMAL=no BUILD_DESKTOP=no KERNEL_ONLY=no KERNEL_CONFIGURE=prebuilt COMPRESS_OUTPUTIMAGE=no IGNORE_UPDATES=yes
+          ./compile.sh docker \
+          BETA=yes \
+          EXPERT=yes \
+          BOARD=${{ matrix.board }} \
+          BRANCH=current \
+          RELEASE=${{ matrix.release }} \
+          BUILD_MINIMAL=no \
+          BUILD_DESKTOP=yes \
+          KERNEL_ONLY=no \
+          KERNEL_CONFIGURE=prebuilt \
+          COMPRESS_OUTPUTIMAGE=no \
+          IGNORE_UPDATES=yes \
+          DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base" \
+          DESKTOP_ENVIRONMENT=${{ matrix.desktop }} \
+          DESKTOP_APPGROUPS_SELECTED=""
 
 #      - name: Upload artefacts
 #        uses: actions/upload-artifact@v2
 #        with:
 #          name: virtual-qemu
 #          path: build/output/images/*
+#          if-no-files-found: ignore
+#          retention-days: 10
diff --git a/.github/workflows/update-repository.yml b/.github/workflows/update-repository.yml
index 8cbd5a8877..17fd296ab7 100644
--- a/.github/workflows/update-repository.yml
+++ b/.github/workflows/update-repository.yml
@@ -11,7 +11,7 @@ jobs:
     repository:
       name: Update stable package repository
       runs-on: [self-hosted, Linux, local]
-      if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }}
+      if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch'
       steps:
 
         - name: Install SSH key for repository
@@ -28,7 +28,7 @@ jobs:
     repository-beta:
       name: Update beta package repository
       runs-on: [self-hosted, Linux, local]
-      if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }}
+      if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch'
       steps:
 
         - name: Install SSH key for repository