diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 8898f3f13..8386e5204 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -5,19 +5,26 @@ on:
     branches: ['*']
     tags: ['*']
   workflow_call:
+    inputs:
+      authorinoOperatorBundleVersion:
+        description: Authorino Operator bundle version
+        default: latest
+      limitadorOperatorBundleVersion:
+        description: Limitador Operator bundle version
+        default: latest
+      wasmShimVersion:
+        description: WASM Shim version
+        default: latest
   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:
@@ -110,22 +117,6 @@ jobs:
           else
           echo "VERSION=${{ github.sha }}" >> $GITHUB_ENV
           fi
-      - name: Add SHA tags if triggered by scheduled workflow
-        if: ${{ github.event_name == "workflow_call" }}
-        id: set-dependencies-sha-tags
-        run: |
-          echo "Setting dependencies image versions from stored variables..."
-          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
@@ -134,7 +125,10 @@ jobs:
         run: |
           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}
+          make bundle REGISTRY=${{ env.IMG_REGISTRY_HOST }} ORG=${{ env.IMG_REGISTRY_ORG }} VERSION=${TAG_NAME/v/} \
+            AUTHORINO_OPERATOR_VERSION=${github.event.inputs.authorinoOperatorBundleVersion} \
+            LIMITADOR_OPERATOR_VERSION=${github.event.inputs.limitadorOperatorBundleVersion} \
+            WASM_SHIM_VERSION=${github.event.inputs.wasmShimVersion}
           else
           make bundle REGISTRY=${{ env.IMG_REGISTRY_HOST }} ORG=${{ env.IMG_REGISTRY_ORG }} IMAGE_TAG=${{ github.ref_name }}
           fi
diff --git a/.github/workflows/scheduled-build.yaml b/.github/workflows/scheduled-build.yaml
index 027fbc969..b2ef6dd45 100644
--- a/.github/workflows/scheduled-build.yaml
+++ b/.github/workflows/scheduled-build.yaml
@@ -11,3 +11,7 @@ jobs:
   workflow-build:
     name: Calls build-images workflow
     uses: ./.github/workflows/build-images.yaml
+    with:
+      authorinoOperatorBundleVersion: ${vars.AUTHORINO_OPERATOR_BUNDLE_SHA}
+      limitadorOperatorBundleVersion: ${vars.LIMITADOR_OPERATOR_BUNDLE_SHA}
+      wasmShimVersion: ${vars.WASM_SHIM_SHA}