diff --git a/.github/workflows/build-beta-images.yml b/.github/workflows/build-images.yml
similarity index 77%
rename from .github/workflows/build-beta-images.yml
rename to .github/workflows/build-images.yml
index 0efe9d5b60..d8bfc953df 100644
--- a/.github/workflows/build-beta-images.yml
+++ b/.github/workflows/build-images.yml
@@ -1,8 +1,25 @@
-name: Beta Images
+name: Build Images
 
 on:
   workflow_dispatch:
-
+    inputs:
+      choice:
+        type: choice
+        description: Build targets
+        options:
+        - beta
+        - stable
+        - rc
+      runner:
+        type: choice
+        description: Build runners for CLI
+        options:
+        - small
+        - ubuntu-latest
+      sourcerepo:
+        description: Source repository
+        required: true
+        default: 'nightly'
 jobs:
 
   fake:
@@ -36,8 +53,9 @@ jobs:
 
     with:
  
-      variant: 'cli:beta'
-      runner: "small"
+      variant: 'cli:${{ github.event.inputs.choice }}'
+      sourcerepo: '${{ github.event.inputs.sourcerepo }}'
+      runner: '${{ github.event.inputs.runner }}'
       part: 1
       of: 1
       include: 'grep uefi-x86 | '
@@ -59,7 +77,8 @@ jobs:
 
     with:
 
-      variant: 'desktop:beta'
+      variant: 'desktop:${{ github.event.inputs.choice }}'
+      sourcerepo: '${{ github.event.inputs.sourcerepo }}'
       runner: "big"
       part: 1
       of: 1
@@ -82,8 +101,9 @@ jobs:
 
     with:
  
-      variant: 'cli:beta'
-      runner: "small"
+      variant: 'cli:${{ github.event.inputs.choice }}'
+      sourcerepo: '${{ github.event.inputs.sourcerepo }}'
+      runner: '${{ github.event.inputs.runner }}'
       part: 1
       of: 1
       include: ''
@@ -105,7 +125,8 @@ jobs:
     uses: armbian/scripts/.github/workflows/build-with-docker.yml@master
 
     with:
-      variant: 'desktop:beta'
+      variant: 'desktop:${{ github.event.inputs.choice }}'
+      sourcerepo: '${{ github.event.inputs.sourcerepo }}'
       runner: "big"
       part: 1
       of: 1      
diff --git a/.github/workflows/build-train.yml b/.github/workflows/build-train.yml
index 1afd6211d6..e635f7f346 100644
--- a/.github/workflows/build-train.yml
+++ b/.github/workflows/build-train.yml
@@ -243,6 +243,7 @@ jobs:
  
       variant: 'cli:beta'
       runner: "ubuntu-latest"
+      sourcerepo: 'nightly'
       part: 1
       of: 1
       include: 'grep uefi-x86 | '
@@ -272,6 +273,7 @@ jobs:
 
       variant: 'desktop:beta'
       runner: "ubuntu-latest"
+      sourcerepo: 'nightly'
       part: 1
       of: 1
       include: 'grep uefi-x86 | '
@@ -301,6 +303,7 @@ jobs:
  
       variant: 'cli:beta'
       runner: "ubuntu-latest"
+      sourcerepo: 'nightly'
       part: 1
       of: 1
       include: ''
@@ -329,6 +332,7 @@ jobs:
     with:
       variant: 'desktop:beta'
       runner: "big"
+      sourcerepo: 'nightly'
       part: 1
       of: 1      
       include: ''