diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8db7477..d75d24b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   # This workflow contains a single job called "build"
   setup-sdk:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Cache sdk
@@ -100,7 +100,7 @@ jobs:
   build:
     # The type of runner that the job will run on
     needs: setup-sdk
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.job_vars.outputs.VERSION }}
       repo_name: ${{ steps.job_vars.outputs.REPO_NAME }}
@@ -161,9 +161,10 @@ jobs:
           ls -l ${GITHUB_WORKSPACE}
           ls -l ${GITHUB_WORKSPACE}/oricutron
           ls -l ${GITHUB_WORKSPACE}/oricutron/roms
-          git clone https://github.com/orix-software/docker-unit-test.git
-          cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd ..
+
           if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then
+            git clone https://github.com/orix-software/docker-unit-test.git
+            cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd ..
             echo "Tests found, let's start"
             cp tests/build/*  > ${GITHUB_WORKSPACE}/oricutron/sdcard/BIN
             echo "#!/bin/submit\n" > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT
@@ -196,7 +197,7 @@ jobs:
 
   upload:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash