diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index a1c10535f..254813335 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -27,7 +27,7 @@ on:
 jobs:
   build:
     if: ${{ github.repository == 'nextcloud/nextcloudpi' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"
@@ -75,7 +75,7 @@ jobs:
     if: ${{ inputs.arch != 'armhf' }}
     needs:
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"
@@ -394,7 +394,7 @@ jobs:
   test:
     needs:
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
       ARCH: "${{ inputs.arch || 'x86' }}"