diff --git a/.github/workflows/build-and-push-templates.yaml b/.github/workflows/build-and-push-templates.yaml
index aed0d3bd..08272395 100644
--- a/.github/workflows/build-and-push-templates.yaml
+++ b/.github/workflows/build-and-push-templates.yaml
@@ -45,7 +45,7 @@ env:
 jobs:
   discover-templates:
     name: Discover templates
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     outputs:
       # Base templates (use external base images like ubuntu:22.04)
       base_matrix: ${{ steps.discover.outputs.base_matrix }}
@@ -737,7 +737,7 @@ jobs:
     name: "[Base] Create manifest for ${{ matrix.name }}"
     needs: [discover-templates, build-base-images]
     if: github.event_name != 'pull_request' && needs.discover-templates.outputs.has_base_templates == 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix: ${{ fromJson(needs.discover-templates.outputs.base_templates) }}
       fail-fast: false
@@ -1230,7 +1230,7 @@ jobs:
       github.event_name != 'pull_request' &&
       needs.discover-templates.outputs.has_dependent_templates == 'true' &&
       needs.build-dependent-images.result == 'success'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix: ${{ fromJson(needs.discover-templates.outputs.dependent_templates) }}
       fail-fast: false
@@ -1652,7 +1652,7 @@ jobs:
     name: "[GPU] Create manifest for ${{ matrix.name }}"
     needs: [discover-templates, build-gpu-base-images]
     if: github.event_name != 'pull_request' && needs.discover-templates.outputs.has_gpu_base_templates == 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix: ${{ fromJson(needs.discover-templates.outputs.gpu_base_templates) }}
       fail-fast: false
@@ -2017,7 +2017,7 @@ jobs:
       github.event_name != 'pull_request' &&
       needs.discover-templates.outputs.has_gpu_dependent_templates == 'true' &&
       needs.build-gpu-dependent-images.result == 'success'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix: ${{ fromJson(needs.discover-templates.outputs.gpu_dependent_templates) }}
       fail-fast: false
@@ -2145,7 +2145,7 @@ jobs:
 
   build-summary:
     name: Build Summary
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     needs: [discover-templates, build-base-images, merge-base-manifests, build-dependent-images, merge-dependent-manifests, build-gpu-base-images, merge-gpu-base-manifests, build-gpu-dependent-images, merge-gpu-dependent-manifests]
     if: always() && !cancelled()
     steps:
@@ -2225,7 +2225,7 @@ jobs:
 
   report-failure:
     name: Report Build Failure
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     needs: [build-summary]
     if: failure() && github.event_name != 'pull_request'
     permissions: