diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml
index 2307790c19..955d9f1a98 100644
--- a/.github/workflows/kubernetes-ci.yml
+++ b/.github/workflows/kubernetes-ci.yml
@@ -175,6 +175,7 @@ jobs:
     name: Test on Kubernetes
     runs-on: ubuntu-latest
     needs: calculate-changed-quickstarts
+    if: ${{ needs.calculate-changed-quickstarts.outputs.quickstart-matrix != null }}
     strategy:
       matrix: ${{fromJSON(needs.calculate-changed-quickstarts.outputs.quickstart-matrix)}}
     steps:
diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml
index a507b0899e..b2b5dd7ed0 100644
--- a/.github/workflows/project_ci.yml
+++ b/.github/workflows/project_ci.yml
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [17]
-        os: [ubuntu-20.04, windows-latest]
+        os: [ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
         with: