diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml
index 7c4a66e40a..2591663aad 100644
--- a/.github/workflows/sitl_tests.yml
+++ b/.github/workflows/sitl_tests.yml
@@ -26,14 +26,13 @@ jobs:
     name: Testing PX4 ${{ matrix.config.model }}
     runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev-simulation-focal:2021-09-08
+      image: px4io/px4-dev-simulation-jammy:2024-09-15
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {model: "iris",          latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo" } # Alaska
-          - {model: "tailsitter" ,   latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo" } # Florida
+          - {model: "quadx",         latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo" } # Alaska
           - {model: "standard_vtol", latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage" } # Zurich
 
     steps:
@@ -74,19 +73,11 @@ jobs:
       - name: Cache Post-Run [px4_sitl_default]
         run: ccache -s
 
-      - name: Build SITL Gazebo
-        env:
-          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: make px4_sitl_default sitl_gazebo-classic
-
-      - name: Cache Post-Run [sitl_gazebo-classic]
-        run: ccache -s
-
       - name: Download MAVSDK
-        run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+        run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu22.04_amd64.deb"
 
       - name: Install MAVSDK
-        run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+        run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu22.04_amd64.deb"
 
       - name: Check PX4 Environment Variables
         env:
@@ -102,9 +93,9 @@ jobs:
         env:
           PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
           DONT_RUN: 1
-        run: make px4_sitl_default sitl_gazebo-classic mavsdk_tests
+        run: make px4_sitl_default mavsdk_tests
 
-      - name: Cache Post-Run [px4_sitl_default sitl_gazebo-classic mavsdk_tests]
+      - name: Cache Post-Run [px4_sitl_default mavsdk_tests]
         run: ccache -s
 
       - name: Core Dump Settings
@@ -118,7 +109,7 @@ jobs:
           PX4_HOME_LON: ${{matrix.config.longitude}}
           PX4_HOME_ALT: ${{matrix.config.altitude}}
           PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 10 --abort-early --model ${{matrix.config.model}} test/mavsdk_tests/configs/gazebo-classic-sitl.json --verbose --force-color
+        run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 10 --abort-early --model ${{matrix.config.model}} test/mavsdk_tests/configs/sih-sitl.json --verbose --force-color
         timeout-minutes: 45
 
       - name: Upload failed logs