diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4dd25d5..a33fe6d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8471b82..8e20c12 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,7 +13,7 @@ jobs:
   parameters:
     arch: amd64
     pool:
-      vmImage: 'ubuntu-20.04'
+      vmImage: 'ubuntu-24.04'
     codeCoverage: true
     containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest
 - template: .azure-pipelines/build.yml