diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
index 7bc8ad1..29da7c7 100644
--- a/.github/workflows/curl.yml
+++ b/.github/workflows/curl.yml
@@ -8,6 +8,17 @@ on:
     branches: [ 'main' ]
     paths: ['.github/workflows/curl.yml', 'curl/**']
   workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
+
+env:
+  build-args: |
+    LIBOQS_TAG=main
+    OQSPROVIDER_TAG=main
 
 jobs:
   build:
@@ -18,12 +29,6 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-        build:
-          - name: release
-          - name: latest
-            build-args: |
-              LIBOQS_TAG=main
-              OQSPROVIDER_TAG=main
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v3
@@ -42,7 +47,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
-            ${{ matrix.build.build-args }}
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
           tags: oqs-curl
 
       - name: Build the Docker image (dev)
@@ -53,7 +58,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
-            ${{ matrix.build.build-args }}
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
           target: dev
           tags: oqs-curl-dev
 
diff --git a/.github/workflows/httpd.yml b/.github/workflows/httpd.yml
index 7c1f1eb..25e4a42 100644
--- a/.github/workflows/httpd.yml
+++ b/.github/workflows/httpd.yml
@@ -8,6 +8,17 @@ on:
     branches: [ 'main' ]
     paths: ['.github/workflows/httpd.yml', 'httpd/**']
   workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
+
+env:
+  build-args: |
+    LIBOQS_TAG=main
+    OQSPROVIDER_TAG=main
 
 jobs:
   build:
@@ -18,12 +29,6 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-        build:
-          - name: release
-          - name: latest
-            build-args: |
-              LIBOQS_TAG=main
-              OQSPROVIDER_TAG=main
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v3
@@ -42,7 +47,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
-            ${{ matrix.build.build-args }}
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
           tags: oqs-httpd
 
       - name: Build the curl Docker image
@@ -53,7 +58,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
-            ${{ matrix.build.build-args }}
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
           tags: oqs-curl
 
       - name: Test httpd using curl
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
index 54a3058..076a494 100644
--- a/.github/workflows/openssl3.yml
+++ b/.github/workflows/openssl3.yml
@@ -8,6 +8,17 @@ on:
     branches: [ 'main' ]
     paths: ['.github/workflows/openssl3.yml', 'openssl3/**']
   workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
+
+env:
+  build-args: |
+    LIBOQS_TAG=main
+    OQSPROVIDER_TAG=main
 
 jobs:
   build:
@@ -18,12 +29,6 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-        build:
-          - name: release
-          - name: latest
-            build-args: |
-              LIBOQS_TAG=main
-              OQSPROVIDER_TAG=main
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v3
@@ -42,7 +47,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
-            ${{ matrix.build.build-args }}
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
           tags: oqs-ossl3
 
       - name: Spot-test - One baseline and one hybrid QSC alg