diff --git a/.github/workflows/test_environment.yml b/.github/workflows/test_environment.yml
index 126a3e40d9..71e3c6d1be 100644
--- a/.github/workflows/test_environment.yml
+++ b/.github/workflows/test_environment.yml
@@ -9,12 +9,12 @@ on:
       - master
     paths:
       - '.github/workflows/test_environment.yml'
-      - 'Tools/scripts/environment_install/**'
+      - 'Tools/environment_install/**'
 
   pull_request:
     paths:
       - '.github/workflows/test_environment.yml'
-      - 'Tools/scripts/environment_install/**'
+      - 'Tools/environment_install/**'
 
 
 concurrency:
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
       image: ${{matrix.os}}:${{matrix.name}}
       options: --privileged
@@ -32,11 +32,15 @@ jobs:
       matrix:
         include:
           - os: ubuntu
-            name: bionic
-          - os: ubuntu
+						
+					  
             name: focal
           - os: ubuntu
-            name: hirsute
+            name: jammy
+          - os: ubuntu
+            name: lunar
+          - os: ubuntu
+            name: mantic
           - os: archlinux
             name: latest
           - os: debian
@@ -69,7 +73,7 @@ jobs:
           software-properties-common
           ;;
           *"archlinux"*)
-          pacman -Sy --noconfirm --needed git sudo
+          pacman -Syu --noconfirm --needed git sudo
           ;;
           esac
 
@@ -78,7 +82,7 @@ jobs:
         with:
             submodules: 'recursive'
       - name: test install environment ${{matrix.os}}.${{matrix.name}}
-        timeout-minutes: 30
+        timeout-minutes: 45
         env:
           DISABLE_MAVNATIVE: True
           DEBIAN_FRONTEND: noninteractive
@@ -116,6 +120,7 @@ jobs:
         run: |
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
           source ~/.bashrc
+          source $HOME/venv-ardupilot/bin/activate || true
           git config --global --add safe.directory /__w/ardupilot/ardupilot
           ./waf configure
           ./waf rover
@@ -129,6 +134,7 @@ jobs:
         run: |
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
           source ~/.bashrc
+          source $HOME/venv-ardupilot/bin/activate || true
           case ${{matrix.os}} in
             *"archlinux"*)
               export PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin:$PATH