diff --git a/ci/options.json b/ci/options.json
index 7181ae06..ba969b9b 100644
--- a/ci/options.json
+++ b/ci/options.json
@@ -62,26 +62,26 @@
     "RunPerformance": true
   },
   {
-    "Image": "ubuntu-22.04",
+    "Image": "ubuntu-latest",
     "Name": "Ubuntu_x64_Debug",
     "Configuration": "Debug",
     "Arch": "x64"
   },
   {
-    "Image": "ubuntu-22.04",
+    "Image": "ubuntu-latest",
     "Name": "Ubuntu_x86_Release",
     "Configuration": "Release",
     "Arch": "x86",
     "RunPerformance": true
   },
   {
-    "Image": "ubuntu-22.04",
+    "Image": "ubuntu-latest",
     "Name": "Ubuntu_x86_Debug",
     "Configuration": "Debug",
     "Arch": "x86"
   },
   {
-    "Image": "ubuntu-22.04",
+    "Image": "ubuntu-latest",
     "Name": "Ubuntu_x64_Release",
     "Configuration": "Release",
     "Arch": "x64",
diff --git a/ci/setup-environment.ps1 b/ci/setup-environment.ps1
index cec93a0a..44419d69 100644
--- a/ci/setup-environment.ps1
+++ b/ci/setup-environment.ps1
@@ -14,5 +14,5 @@ if ($BuildMethod -eq "msbuild") {
 }
 
 if ($IsLinux -or $IsMacOS) {
-    python -m pip install --user 'gcovr~=7.2' || $(throw "gcovr install failed")
+    pipx install 'gcovr~=7.2' || $(throw "gcovr install failed")
 }