diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 1b690bc..a8d38b4 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -12,8 +12,35 @@ jobs:
         arch: [ amd64, arm64 ]
     steps:
       - uses: actions/checkout@v4
-      # todo: remove when crun issue is resolved
-      - uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
+      # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
+      - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
+        run: |
+          tmpdir="$(mktemp -d)"
+          pushd "$tmpdir"
+          if [ "${{ inputs.arch }}" = "amd64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
+            GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
+          elif [ "${{ inputs.arch }}" = "arm64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
+            GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
+          fi
+
+          sha256sum ./crun
+          OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
+
+          if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
+              sudo install crun /usr/bin/crun
+          else
+              echo "Checksums do not match"
+              exit 1
+          fi
+          popd
+          rm -rf "$tmpdir"
+        shell: bash
+      - name: Show crun version after the patch
+        shell: bash
+        run: |
+          crun --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Build the image
@@ -38,8 +65,35 @@ jobs:
         platform: [ kvm, metal ]
     steps:
       - uses: actions/checkout@v4
-      # todo: remove when crun issue is resolved
-      - uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
+      # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
+      - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
+        run: |
+          tmpdir="$(mktemp -d)"
+          pushd "$tmpdir"
+          if [ "${{ inputs.arch }}" = "amd64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
+            GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
+          elif [ "${{ inputs.arch }}" = "arm64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
+            GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
+          fi
+
+          sha256sum ./crun
+          OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
+
+          if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
+              sudo install crun /usr/bin/crun
+          else
+              echo "Checksums do not match"
+              exit 1
+          fi
+          popd
+          rm -rf "$tmpdir"
+        shell: bash
+      - name: Show crun version after the patch
+        shell: bash
+        run: |
+          crun --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Configure Build Variant
diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
index 0904869..e11d5a3 100644
--- a/.github/workflows/repo.yml
+++ b/.github/workflows/repo.yml
@@ -16,8 +16,35 @@ jobs:
         arch: [ amd64, arm64 ]
     steps:
       - uses: actions/checkout@v4
-      # todo: remove when crun issue is resolved
-      - uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
+      # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
+      - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
+        run: |
+          tmpdir="$(mktemp -d)"
+          pushd "$tmpdir"
+          if [ "${{ inputs.arch }}" = "amd64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
+            GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
+          elif [ "${{ inputs.arch }}" = "arm64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
+            GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
+          fi
+
+          sha256sum ./crun
+          OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
+
+          if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
+              sudo install crun /usr/bin/crun
+          else
+              echo "Checksums do not match"
+              exit 1
+          fi
+          popd
+          rm -rf "$tmpdir"
+        shell: bash
+      - name: Show crun version after the patch
+        shell: bash
+        run: |
+          crun --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Build the repo
@@ -42,8 +69,35 @@ jobs:
         platform: [ kvm, metal ]
     steps:
       - uses: actions/checkout@v4
-      # todo: remove when crun issue is resolved
-      - uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
+      # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
+      - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
+        run: |
+          tmpdir="$(mktemp -d)"
+          pushd "$tmpdir"
+          if [ "${{ inputs.arch }}" = "amd64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
+            GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
+          elif [ "${{ inputs.arch }}" = "arm64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
+            GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
+          fi
+
+          sha256sum ./crun
+          OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
+
+          if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
+              sudo install crun /usr/bin/crun
+          else
+              echo "Checksums do not match"
+              exit 1
+          fi
+          popd
+          rm -rf "$tmpdir"
+        shell: bash
+      - name: Show crun version after the patch
+        shell: bash
+        run: |
+          crun --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Configure Build Variant
diff --git a/.github/workflows/sysexts.yml b/.github/workflows/sysexts.yml
index e9c61ec..949e1c0 100644
--- a/.github/workflows/sysexts.yml
+++ b/.github/workflows/sysexts.yml
@@ -12,8 +12,35 @@ jobs:
         arch: [ x86-64, arm64 ]
     steps:
       - uses: actions/checkout@v4
-      # todo: remove when crun issue is resolved
-      - uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
+      # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
+      - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
+        run: |
+          tmpdir="$(mktemp -d)"
+          pushd "$tmpdir"
+          if [ "${{ inputs.arch }}" = "amd64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
+            GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
+          elif [ "${{ inputs.arch }}" = "arm64" ]; then
+            curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
+            GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
+          fi
+
+          sha256sum ./crun
+          OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
+
+          if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
+              sudo install crun /usr/bin/crun
+          else
+              echo "Checksums do not match"
+              exit 1
+          fi
+          popd
+          rm -rf "$tmpdir"
+        shell: bash
+      - name: Show crun version after the patch
+        shell: bash
+        run: |
+          crun --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Setup mkosi