diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index d6e5540bb..8898f3f13 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -5,6 +5,20 @@ on:
     branches: ['*']
     tags: ['*']
   workflow_call:
+  workflow_dispatch:
+    inputs:
+      authorinoOperatorBundleVersion:
+        description: Authorino Operator bundle version
+        required: true
+        default: latest
+      limitadorOperatorBundleVersion:
+        description: Limitador Operator bundle version
+        required: true
+        default: latest
+      wasmShimVersion:
+        description: WASM Shim version
+        required: true
+        default: latest
 
 env:
   IMG_TAGS: ${{ github.sha }}
@@ -104,13 +118,21 @@ jobs:
           echo "AUTHORINO_OPERATOR_VERSION=${vars.AUTHORINO_OPERATOR_BUNDLE_SHA}" >> $GITHUB_ENV
           echo "LIMITADOR_OPERATOR_VERSION=${vars.LIMITADOR_OPERATOR_BUNDLE_SHA}  >> $GITHUB_ENV
           echo "WASM_SHIM_VERSION=${vars.WASM_SHIM_SHA}  >> $GITHUB_ENV
+      - name: Add specific tags if triggered by workflow dispatch
+        if: ${{ github.event_name == "workflow_dispatch" }}
+        id: set-dependencies-specific-tags
+        run: |
+          echo "Setting dependencies image versions from user input..."
+          echo "AUTHORINO_OPERATOR_VERSION=${github.event.inputs.authorinoOperatorBundleVersion}" >> $GITHUB_ENV
+          echo "LIMITADOR_OPERATOR_VERSION=${github.event.inputs.limitadorOperatorBundleVersion}  >> $GITHUB_ENV
+          echo "WASM_SHIM_VERSION=${github.event.inputs.wasmShimVersion}  >> $GITHUB_ENV
       - name: Install qemu dependency
         run: |
           sudo apt-get update
           sudo apt-get install -y qemu-user-static
       - name: Run make bundle
         run: |
-          if [[ ${github.event_name} == "workflow_call" ]]; then
+          if [[ ${github.event_name} == "workflow_call" || ${github.event_name} == "workflow_dispatch" ]]; then
           echo "Building bundle via workflow call"
           make bundle REGISTRY=${{ env.IMG_REGISTRY_HOST }} ORG=${{ env.IMG_REGISTRY_ORG }} VERSION=${TAG_NAME/v/} AUTHORINO_OPERATOR_VERSION=${env.AUTHORINO_OPERATOR_VERSION} LIMITADOR_OPERATOR_VERSION=${env.LIMITADOR_OPERATOR_VERSION} WASM_SHIM_VERSION=${env.WASM_SHIM_VERSION}
           else