diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 43a7c76a6571ca..82614c2c0d7153 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
     zap_regeneration:
         name: ZAP Regeneration
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         container:
             image: ghcr.io/project-chip/chip-build:119
         defaults:
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index e255fb739e2f26..3d66172458b934 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -33,7 +33,7 @@ jobs:
     zap_templates:
         name: ZAP templates generation
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         container:
             image: ghcr.io/project-chip/chip-build:119
         defaults: