diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f0cc9016c..e14c28de0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,6 +36,7 @@ jobs:
   test-build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         builder:
         - docker
@@ -62,11 +63,8 @@ jobs:
       if: ${{ matrix.builder == 'nerdctl' }}
       shell: bash
       run: |
-        curl -sSL https://github.com/containerd/nerdctl/releases/download/v1.7.7/nerdctl-full-1.7.7-linux-amd64.tar.gz -o - | sudo tar -xz -C /usr/local
-        sudo systemctl daemon-reload
-        sudo systemctl enable --now containerd
+        curl -sSL https://github.com/containerd/nerdctl/releases/download/v2.0.3/nerdctl-full-2.0.3-linux-amd64.tar.gz -o - | sudo tar -xz -C /usr/local
         containerd-rootless-setuptool.sh install
-        containerd-rootless-setuptool.sh install-buildkit-containerd
 
     - name: Build Image
       shell: bash
@@ -178,24 +176,6 @@ jobs:
       run: |
         brew install coreutils bash
 
-      # TODO: workaround for https://github.com/actions/runner-images/issues/7753 (caused by https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394).
-      # Remove this when this issue is fixed and available in the ubuntu runner image
-    - name: Setup Podman for Ubuntu
-      if: ${{ matrix.os == 'ubuntu-latest' && (matrix.kwokctl-runtime == 'podman' || matrix.kwokctl-runtime == 'kind-podman') }}
-      shell: bash
-      run: |
-        sudo apt install podman=3.4.4+ds1-1ubuntu1 --allow-downgrades
-
-    - name: Setup Crun on Kind Podman
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.kwokctl-runtime == 'kind-podman' }}
-      shell: bash
-      run: |
-        # crun >= 1.9.1 is required on Ubuntu 20.04.6
-        # https://github.com/kubernetes-sigs/kind/issues/3526
-        curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
-        chmod +x ./crun
-        sudo mv ./crun /usr/bin/crun
-
     - name: Install Docker for MacOS
       if: ${{ startsWith(matrix.os, 'macos-') && ( matrix.kwokctl-runtime == 'docker' || matrix.kwokctl-runtime == 'kind' ) }}
       shell: bash
@@ -220,13 +200,8 @@ jobs:
       if: ${{ matrix.kwokctl-runtime == 'nerdctl' }}
       shell: bash
       run: |
-        sudo mkdir -p /etc/cni/net.d
-        sudo chmod 777 /etc/cni/net.d
-        curl -sSL https://github.com/containerd/nerdctl/releases/download/v1.7.7/nerdctl-full-1.7.7-linux-amd64.tar.gz -o - | sudo tar -xz -C /usr/local
-        sudo systemctl daemon-reload
-        sudo systemctl enable --now containerd
+        curl -sSL https://github.com/containerd/nerdctl/releases/download/v2.0.3/nerdctl-full-2.0.3-linux-amd64.tar.gz -o - | sudo tar -xz -C /usr/local
         containerd-rootless-setuptool.sh install
-        containerd-rootless-setuptool.sh install-buildkit-containerd
 
     - name: Setup Podman for Kind
       if: ${{ matrix.kwokctl-runtime == 'kind-podman' }}
@@ -239,13 +214,6 @@ jobs:
         EOF
         sudo systemctl daemon-reload
 
-    - name: Make pki directory
-      if: ${{ matrix.kwokctl-runtime == 'binary' && matrix.os != 'windows-latest' }}
-      shell: bash
-      run: |
-        sudo mkdir -p /var/run/kubernetes
-        sudo chmod 777 /var/run/kubernetes
-
     - name: Install kubectl
       shell: bash
       run: |