diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bab2b0c..e80ef32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build & Test - all
+name: Run all
 
 on:
   workflow_call:
diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
index 87ab966..850eb8b 100644
--- a/.github/workflows/curl.yml
+++ b/.github/workflows/curl.yml
@@ -1,4 +1,4 @@
-name: Build & Test - curl
+name: curl
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/h2load.yml b/.github/workflows/h2load.yml
index 31af83e..ac7a886 100644
--- a/.github/workflows/h2load.yml
+++ b/.github/workflows/h2load.yml
@@ -1,4 +1,4 @@
-name: Build & Test - h2load
+name: h2load
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml
index a984a12..aab2d35 100644
--- a/.github/workflows/haproxy.yml
+++ b/.github/workflows/haproxy.yml
@@ -1,4 +1,4 @@
-name: Build & Test - haproxy
+name: haproxy
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/httpd.yml b/.github/workflows/httpd.yml
index 2c11dfb..1183346 100644
--- a/.github/workflows/httpd.yml
+++ b/.github/workflows/httpd.yml
@@ -1,4 +1,4 @@
-name: Build & Test - httpd
+name: httpd
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/locust.yml b/.github/workflows/locust.yml
index efb6a04..34a4e30 100644
--- a/.github/workflows/locust.yml
+++ b/.github/workflows/locust.yml
@@ -1,4 +1,4 @@
-name: Build - locust
+name: locust
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/mosquitto.yml b/.github/workflows/mosquitto.yml
index a4336ab..f0d9f06 100644
--- a/.github/workflows/mosquitto.yml
+++ b/.github/workflows/mosquitto.yml
@@ -1,4 +1,4 @@
-name: Build & Test - mosquitto
+name: mosquitto
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
index 3913b23..165eb70 100644
--- a/.github/workflows/nginx.yml
+++ b/.github/workflows/nginx.yml
@@ -1,4 +1,4 @@
-name: Build & Test - nginx
+name: nginx
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/ngtcp2.yml b/.github/workflows/ngtcp2.yml
index 65f8c49..0f6fa30 100644
--- a/.github/workflows/ngtcp2.yml
+++ b/.github/workflows/ngtcp2.yml
@@ -1,4 +1,4 @@
-name: Build & Test - ngtcp2
+name: ngtcp2
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml
index 66648fb..c3cb7dd 100644
--- a/.github/workflows/openssh.yml
+++ b/.github/workflows/openssh.yml
@@ -1,4 +1,4 @@
-name: Build & Test - openssh
+name: openssh
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
index ac39422..f3bb1b7 100644
--- a/.github/workflows/openssl3.yml
+++ b/.github/workflows/openssl3.yml
@@ -1,4 +1,4 @@
-name: Build & Test - openssl3
+name: openssl3
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml
index 292ba52..6254de9 100644
--- a/.github/workflows/openvpn.yml
+++ b/.github/workflows/openvpn.yml
@@ -1,4 +1,4 @@
-name: Build & Test - openvpn
+name: openvpn
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |
diff --git a/.github/workflows/wireshark.yml b/.github/workflows/wireshark.yml
index b045356..be435e2 100644
--- a/.github/workflows/wireshark.yml
+++ b/.github/workflows/wireshark.yml
@@ -1,4 +1,4 @@
-name: Build - wireshark
+name: wireshark
 
 on:
   push:
@@ -14,6 +14,13 @@ on:
         required: false
         default: false
         type: boolean
+  workflow_dispatch:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
 
 env:
   build-args: |