diff --git a/.github/actions/compile/action.yml b/.github/actions/compile/action.yml
index cc1302875..565121da2 100644
--- a/.github/actions/compile/action.yml
+++ b/.github/actions/compile/action.yml
@@ -12,8 +12,6 @@ inputs:
     required: true
   cache_dir:
     required: true
-  kas:
-    required: true
 outputs:
   url:
     description: Location of the published binaries
@@ -21,11 +19,25 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/download-artifact@v6
+    - name: Download kas lockfile
+      uses: actions/download-artifact@v6
       with:
-        name: kas-lock
+        name: kas-lockfile
         path: ci/
 
+    - name: Download kas-container
+      uses: actions/download-artifact@v6
+      with:
+         name: kas-container
+         path: ${{runner.temp}}
+
+    - name: Setting up kas-container
+      shell: bash
+      run: |
+        KAS_CONTAINER=$RUNNER_TEMP/kas-container
+        echo "KAS_CONTAINER=$KAS_CONTAINER" >> $GITHUB_ENV
+        chmod +x $KAS_CONTAINER
+
     - name: Setup build variables and sstate-cache
       shell: bash
       run: |
@@ -38,25 +50,25 @@ runs:
       shell: bash
       run: |
         mkdir $KAS_WORK_DIR
-        ${{inputs.kas}} dump --resolve-env --resolve-local --resolve-refs \
+        $KAS_CONTAINER dump --resolve-env --resolve-local --resolve-refs \
           ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }} > kas-build.yml
 
     - name: Kas qcom world build
       shell: bash
       run: |
-        ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
+        $KAS_CONTAINER build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
         ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
         mv $KAS_WORK_DIR/build/buildchart.svg buildchart-world.svg
 
     - name: Kas build images
       shell: bash
       run: |
-        ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
+        $KAS_CONTAINER build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
         ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
         mv $KAS_WORK_DIR/build/buildchart.svg .
 
         if [ "${{ inputs.machine }}" = "qcom-armv8a" ]; then
-          ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
+          $KAS_CONTAINER build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
         fi
 
     - uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index 79c87b14e..e26b2f895 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -10,15 +10,16 @@ on:
 env:
   CACHE_DIR: /efs/qli/meta-qcom
   KAS_REPO_REF_DIR: /efs/qli/meta-qcom/kas-mirrors
-  KAS_CONTAINER: /efs/qli/meta-qcom/kas-mirrors/kas-container
 
 jobs:
   kas-setup:
     if: github.repository == 'qualcomm-linux/meta-qcom'
     runs-on: [self-hosted, qcom-u2404, amd64-ssd]
     steps:
-      - name: Update kas-container
+      - name: Setting up kas-container
         run: |
+          KAS_CONTAINER=$RUNNER_TEMP/kas-container
+          echo "KAS_CONTAINER=$KAS_CONTAINER" >> $GITHUB_ENV
           LATEST=$(git ls-remote --tags --refs --sort="v:refname" https://github.com/siemens/kas | tail -n1 | sed 's/.*\///')
           wget -qO ${KAS_CONTAINER} https://raw.githubusercontent.com/siemens/kas/refs/tags/$LATEST/kas-container
           chmod +x ${KAS_CONTAINER}
@@ -36,11 +37,18 @@ jobs:
         run: |
           ${KAS_CONTAINER} lock --update ci/base.yml:ci/qcom-distro.yml
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload kas lockfile
+        uses: actions/upload-artifact@v4
         with:
-          name: kas-lock
+          name: kas-lockfile
           path: ci/*.lock.yml
 
+      - name: Upload kas-container
+        uses: actions/upload-artifact@v4
+        with:
+          name: kas-container
+          path: ${{ env.KAS_CONTAINER }}
+
   yocto-run-checks:
     needs: kas-setup
     if: github.repository == 'qualcomm-linux/meta-qcom'
@@ -48,10 +56,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v6
+      - name: Download kas lockfile
+        uses: actions/download-artifact@v6
+        with:
+          name: kas-lockfile
+          path: ci
+
+      - name: Download kas-container
+        uses: actions/download-artifact@v6
         with:
-          name: kas-lock
-          path: ci/
+          name: kas-container
+          path: ${{ runner.temp }}
+
+      - name: Setting up kas-container
+        run: |
+          KAS_CONTAINER=$RUNNER_TEMP/kas-container
+          echo "KAS_CONTAINER=$KAS_CONTAINER" >> $GITHUB_ENV
+          chmod +x $KAS_CONTAINER
 
       - name: Run yocto-check-layer
         run: |
@@ -100,7 +121,6 @@ jobs:
           kernel_yaml: ${{matrix.kernel.yamlfile}}
           kernel_dirname: ${{matrix.kernel.dirname}}
           cache_dir: ${CACHE_DIR}
-          kas: ${KAS_CONTAINER}
 
   compile:
     needs: compile_warm_up
@@ -181,7 +201,6 @@ jobs:
           kernel_yaml: ${{matrix.kernel.yamlfile}}
           kernel_dirname: ${{matrix.kernel.dirname}}
           cache_dir: ${CACHE_DIR}
-          kas: ${KAS_CONTAINER}
 
   publish_summary:
     needs: compile