diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 573ccf75..0a4b16d2 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -13,7 +13,7 @@ on:
       registry:
         type: string
         description: Container registry to use (docker, ghcr)
-        default: ghcr
+        default: docker
         required: false
     secrets:
       DOCKER_USERNAME:
diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml
index 9ac21249..df0415c6 100644
--- a/.github/workflows/test-docker-build.yml
+++ b/.github/workflows/test-docker-build.yml
@@ -3,13 +3,26 @@ name: Test Docker Build
 on:
   push:
     branches:
-      - main
       - feature/multi-arch-docker
+  workflow_dispatch:
+    inputs:
+        version:
+            description: 'Version of the Salesforce CLI to build'
+            required: true
+            default: '0.0.1a1'
+        channel:
+            description: 'Channel to use for the Docker image'
+            required: true
+            default: 'latest'
+        registry:
+            description: 'Container registry to use'
+            required: true
+            default: 'ghcr'
 
 jobs:
   call-build-docker-images:
-    uses: ./.github/workflows/build-docker-images.yml
+    uses: ./.github/workflows/build-docker.yml
     with:
-      version: '0.0.1a1'
-      channel: 'latest'
-      registry: 'ghcr'
\ No newline at end of file
+        version: ${{ github.event.inputs.version }}
+        channel: ${{ github.event.inputs.channel }}
+        registry: ${{ github.event.inputs.registry }}
\ No newline at end of file