diff --git a/.github/workflows/Create-Custom-Jar.yml b/.github/workflows/Create-Custom-Jar.yml
index 3c1a01713a..a3601ad087 100644
--- a/.github/workflows/Create-Custom-Jar.yml
+++ b/.github/workflows/Create-Custom-Jar.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   create_custom_jar:
     name: Create jar
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use this in env var for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/GHA-Functional-Tests.yaml b/.github/workflows/GHA-Functional-Tests.yaml
index e1d17dbd7b..7b668df160 100644
--- a/.github/workflows/GHA-Functional-Tests.yaml
+++ b/.github/workflows/GHA-Functional-Tests.yaml
@@ -21,7 +21,7 @@ jobs:
   java-functional-tests:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 150
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       default-branch: "main"
     strategy:
diff --git a/.github/workflows/GHA-Scala-Functional-Tests.yaml b/.github/workflows/GHA-Scala-Functional-Tests.yaml
index 8f9e89682c..e3a16e1569 100644
--- a/.github/workflows/GHA-Scala-Functional-Tests.yaml
+++ b/.github/workflows/GHA-Scala-Functional-Tests.yaml
@@ -20,7 +20,7 @@ jobs:
   scala-functional-tests:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       ##max-parallel: 1 ## used to force sequential
       fail-fast: false
diff --git a/.github/workflows/GHA-Scala-Instrumentation-Tests.yaml b/.github/workflows/GHA-Scala-Instrumentation-Tests.yaml
index 12fc21c005..e94e3f3538 100644
--- a/.github/workflows/GHA-Scala-Instrumentation-Tests.yaml
+++ b/.github/workflows/GHA-Scala-Instrumentation-Tests.yaml
@@ -20,7 +20,7 @@ jobs:
   scala-instrumentation-tests:
     name: Scala ${{ matrix.scala }} on Java ${{ matrix.java-version }}
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use this in env var for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/GHA-Spotbugs.yml b/.github/workflows/GHA-Spotbugs.yml
index 744a13a18e..d99919dc8e 100644
--- a/.github/workflows/GHA-Spotbugs.yml
+++ b/.github/workflows/GHA-Spotbugs.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   spotbugs:
     timeout-minutes: 15
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
@@ -78,7 +78,7 @@ jobs:
 
   publish:
     needs: spotbugs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency: gh-pages
     env:
       BRANCH_NAME: ${{ inputs.agent-ref || 'main' }}
diff --git a/.github/workflows/GHA-Unit-Tests.yaml b/.github/workflows/GHA-Unit-Tests.yaml
index 4e593ff7ef..daab5d1c2a 100644
--- a/.github/workflows/GHA-Unit-Tests.yaml
+++ b/.github/workflows/GHA-Unit-Tests.yaml
@@ -20,7 +20,7 @@ jobs:
   unit-test:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 150
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       # max-parallel: 1 ## used to force sequential vs. concurrent
       fail-fast: false
diff --git a/.github/workflows/GHPages-Cleanup.yml b/.github/workflows/GHPages-Cleanup.yml
index 2cb4f75f8f..9acbbca3e7 100644
--- a/.github/workflows/GHPages-Cleanup.yml
+++ b/.github/workflows/GHPages-Cleanup.yml
@@ -14,7 +14,7 @@ on:
         type: string
 jobs:
   cleanup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       DAYS: ${{ inputs.days || '5' }}
     steps:
diff --git a/.github/workflows/Java-Instrumentation-Tests.yml b/.github/workflows/Java-Instrumentation-Tests.yml
index afbb29a05a..de64bae3d1 100644
--- a/.github/workflows/Java-Instrumentation-Tests.yml
+++ b/.github/workflows/Java-Instrumentation-Tests.yml
@@ -24,7 +24,7 @@ jobs:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
     # needs: install-all-java
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use these in env vars for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.aws-secret-access-key }}
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index c2bd4fda4f..f8a7c85a50 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -267,7 +267,7 @@ jobs:
     secrets: inherit
 
   another-job:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: build-agent
     steps:
       - name: Retrieve agent from cache
diff --git a/.github/workflows/Release-CopyToS3-prod.yml b/.github/workflows/Release-CopyToS3-prod.yml
index 0f22d252cf..4378487a53 100644
--- a/.github/workflows/Release-CopyToS3-prod.yml
+++ b/.github/workflows/Release-CopyToS3-prod.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   copy-to-s3:
     name: Copy ${{ inputs.version_number }} to S3 (Prod)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Self
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
diff --git a/.github/workflows/Release-CopyToS3-staging.yml b/.github/workflows/Release-CopyToS3-staging.yml
index 4e5052fb7c..0f4f2bcfae 100644
--- a/.github/workflows/Release-CopyToS3-staging.yml
+++ b/.github/workflows/Release-CopyToS3-staging.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   copy-to-s3:
     name: Copy ${{ inputs.version_number }} to S3 (Staging)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Self
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
diff --git a/.github/workflows/Release-UpdateSystemConfig.yml b/.github/workflows/Release-UpdateSystemConfig.yml
index 0638d7134b..dded43915d 100644
--- a/.github/workflows/Release-UpdateSystemConfig.yml
+++ b/.github/workflows/Release-UpdateSystemConfig.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   update-system-config:
     name: Set java_agent_version to ${{ inputs.version_number }} in system config
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Update system configuration page
         run: |
diff --git a/.github/workflows/Test-AITs.yml b/.github/workflows/Test-AITs.yml
index 843edae285..ca957fca36 100644
--- a/.github/workflows/Test-AITs.yml
+++ b/.github/workflows/Test-AITs.yml
@@ -47,7 +47,7 @@ jobs:
 
   list-tests:
     name: List tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       tests: ${{ steps.read-single-test.outputs.tests || steps.read-tests.outputs.tests }}
     steps:
@@ -117,7 +117,7 @@ jobs:
     name: ${{ matrix.tests }}
     needs: [ build-agent, list-tests ]
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     # Determine if easier to make the env strings below part of the matrix
     strategy:
       fail-fast: false
@@ -364,7 +364,7 @@ jobs:
 
   notify-if-negative-values:
     needs: [ tests ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Download artifact(s) # surely there is a way to only download the negative_value_*.txt artifacts?
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # pin@v4
diff --git a/.github/workflows/VerifyInstrumentation-Single.yml b/.github/workflows/VerifyInstrumentation-Single.yml
index 4bf1d26f81..756e3a4e6f 100644
--- a/.github/workflows/VerifyInstrumentation-Single.yml
+++ b/.github/workflows/VerifyInstrumentation-Single.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   verify-module:
     name: Verify Instrumentation (${{ github.event.inputs.module || inputs.module }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       MODULE: ${{ github.event.inputs.module || inputs.module }}
       AWS_KEY: ${{ secrets.aws-secret-access-key }}
diff --git a/.github/workflows/VerifyInstrumentation.yml b/.github/workflows/VerifyInstrumentation.yml
index d0f30dff30..e712a82d55 100644
--- a/.github/workflows/VerifyInstrumentation.yml
+++ b/.github/workflows/VerifyInstrumentation.yml
@@ -54,7 +54,7 @@ jobs:
   notify-failure:
     needs: [ verify-instrumentation-1, verify-instrumentation-2 ]
     if: ${{ failure() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Send failure message to Slack
         id: slack
diff --git a/.github/workflows/X-Reusable-BuildAgent.yml b/.github/workflows/X-Reusable-BuildAgent.yml
index 351be05477..283e8cdc08 100644
--- a/.github/workflows/X-Reusable-BuildAgent.yml
+++ b/.github/workflows/X-Reusable-BuildAgent.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   # build the agent and saves Gradle's cache so all modules can use the cache
   build-agent:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use this in env var for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/X-Reusable-VerifyInstrumentation.yml b/.github/workflows/X-Reusable-VerifyInstrumentation.yml
index cd6857dbfd..194932a5e6 100644
--- a/.github/workflows/X-Reusable-VerifyInstrumentation.yml
+++ b/.github/workflows/X-Reusable-VerifyInstrumentation.yml
@@ -22,7 +22,7 @@ jobs:
   # this job reads the directories in newrelic-java-agent/instrumentation and creates a JSON with the list of the modules
   # this list is paginated and will be used in the verify-module job.
   read-modules:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       modules: ${{ steps.set-modules.outputs.modules }}
     steps:
@@ -48,7 +48,7 @@ jobs:
 
   verify-module:
     name: ${{ matrix.modules }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: read-modules
     strategy:
       fail-fast: false
diff --git a/.github/workflows/publish_main_snapshot.yml b/.github/workflows/publish_main_snapshot.yml
index 58f7a13c3b..7f897d6936 100644
--- a/.github/workflows/publish_main_snapshot.yml
+++ b/.github/workflows/publish_main_snapshot.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   publish_snapshot:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
 
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 097582045d..6dea239ca3 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
 
diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
index c4d93c3992..5a36a5f65b 100644
--- a/.github/workflows/repolinter.yml
+++ b/.github/workflows/repolinter.yml
@@ -11,7 +11,7 @@ on: [ push, workflow_dispatch ]
 jobs:
   repolint:
     name: Run Repolinter
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Test Default Branch
         id: default-branch