diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
index 5745f95..91975ec 100644
--- a/.github/workflows/matomo-tests.yml
+++ b/.github/workflows/matomo-tests.yml
@@ -33,7 +33,7 @@ concurrency:
 
 jobs:
   PluginTests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -56,7 +56,7 @@ jobs:
           artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
           upload-artifacts: ${{ matrix.php == '7.2' && matrix.target == 'maximum_supported_matomo' }}
   UI:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index fb7d08b..9d675e4 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -17,7 +17,7 @@ permissions:
 jobs:
   phpcs:
     name: PHPCS
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png b/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png
index 4181729..e7c4026 100644
Binary files a/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png and b/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png differ
diff --git a/tests/UI/expected-ui-screenshots/CustomVariables_manage.png b/tests/UI/expected-ui-screenshots/CustomVariables_manage.png
index 8b7e084..08c4f48 100644
Binary files a/tests/UI/expected-ui-screenshots/CustomVariables_manage.png and b/tests/UI/expected-ui-screenshots/CustomVariables_manage.png differ