diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
index de62ea3..672ca26 100644
--- a/.github/workflows/curl.yml
+++ b/.github/workflows/curl.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -139,7 +139,7 @@ jobs:
             openquantumsafe/curl:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/h2load.yml b/.github/workflows/h2load.yml
index 5228a1d..ca697da 100644
--- a/.github/workflows/h2load.yml
+++ b/.github/workflows/h2load.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -98,7 +98,7 @@ jobs:
             openquantumsafe/h2load:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml
index f3f25aa..8d1bfd0 100644
--- a/.github/workflows/haproxy.yml
+++ b/.github/workflows/haproxy.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -101,7 +101,7 @@ jobs:
             openquantumsafe/haproxy:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/httpd.yml b/.github/workflows/httpd.yml
index 5a2be7a..fb1c399 100644
--- a/.github/workflows/httpd.yml
+++ b/.github/workflows/httpd.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -101,7 +101,7 @@ jobs:
             openquantumsafe/httpd:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/locust.yml b/.github/workflows/locust.yml
index 970a4b0..cdacba4 100644
--- a/.github/workflows/locust.yml
+++ b/.github/workflows/locust.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -125,7 +125,7 @@ jobs:
             openquantumsafe/locust:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/mosquitto.yml b/.github/workflows/mosquitto.yml
index caa3a48..30b1d0a 100644
--- a/.github/workflows/mosquitto.yml
+++ b/.github/workflows/mosquitto.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -92,7 +92,7 @@ jobs:
             openquantumsafe/mosquitto:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
index 16b0b75..407a99c 100644
--- a/.github/workflows/nginx.yml
+++ b/.github/workflows/nginx.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -102,7 +102,7 @@ jobs:
             openquantumsafe/nginx:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/ngtcp2.yml b/.github/workflows/ngtcp2.yml
index 3da18a8..c0d7292 100644
--- a/.github/workflows/ngtcp2.yml
+++ b/.github/workflows/ngtcp2.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -118,7 +118,7 @@ jobs:
             openquantumsafe/ngtcp2-client:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml
index 152d457..cfb23ad 100644
--- a/.github/workflows/openssh.yml
+++ b/.github/workflows/openssh.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -88,7 +88,7 @@ jobs:
             openquantumsafe/openssh:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
index a1ea2c0..d920629 100644
--- a/.github/workflows/openssl3.yml
+++ b/.github/workflows/openssl3.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -89,7 +89,7 @@ jobs:
             openquantumsafe/openssl3:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml
index 4b52e60..1ae765c 100644
--- a/.github/workflows/openvpn.yml
+++ b/.github/workflows/openvpn.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -89,7 +89,7 @@ jobs:
             openquantumsafe/openvpn:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/wireshark.yml b/.github/workflows/wireshark.yml
index b8d2f49..2131fd7 100644
--- a/.github/workflows/wireshark.yml
+++ b/.github/workflows/wireshark.yml
@@ -34,7 +34,7 @@ env:
   build-args: |
     LIBOQS_TAG=main
     OQSPROVIDER_TAG=main
-  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+  push: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
 
 jobs:
   build:
@@ -82,7 +82,7 @@ jobs:
             openquantumsafe/wireshark:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
 
   push:
-    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'  && inputs.build_main != 'true' }}
     needs: build
     runs-on: ubuntu-latest
     steps: