diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index 6f1113d44..4a71d03cc 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   test:
     name: General checks, tests and coverage reporting
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
 
     - uses: actions/checkout@v4
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 69218795c..5a02eef21 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,25 +9,25 @@ trigger:
 strategy:
   matrix:
     linux_node_lts_16:
-      imageName: 'ubuntu-22.04'
+      imageName: 'ubuntu-24.04'
       node_version: 16.x
     linux_node_lts_18_min_version:
-      imageName: 'ubuntu-22.04'
+      imageName: 'ubuntu-24.04'
       node_version: 18.12.0
     linux_node_lts_18:
-      imageName: 'ubuntu-22.04'
+      imageName: 'ubuntu-24.04'
       node_version: 18.x
     mac_node_lts_18:
-      imageName: 'macos-12'
+      imageName: 'macos-13'
       node_version: 18.x
     windows_node_lts_18:
       imageName: 'windows-2022'
       node_version: 18.x
     linux_node_current:
-      imageName: 'ubuntu-22.04'
+      imageName: 'ubuntu-24.04'
       node_version: 20.x
     mac_node_current:
-      imageName: 'macos-12'
+      imageName: 'macos-13'
       node_version: 20.x
     windows_node_current:
       imageName: 'windows-2022'
@@ -58,11 +58,10 @@ steps:
     testResultsFormat: 'JUnit'
     testResultsFiles: '$(System.DefaultWorkingDirectory)/test-results.xml'
 
-- task: PublishCodeCoverageResults@1
+- task: PublishCodeCoverageResults@2
   displayName: Publish Test Coverage Results
   condition: succeededOrFailed()
   inputs:
-    codeCoverageTool: 'cobertura'
     summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
 
 - script: npm run coverage