diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02a47d72e..f1ecdd46f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,10 +37,10 @@ jobs:
           - ros-distro: noetic
             ros-version: 1
             platform: "amd64"
+            base-image: "ubuntu:20.04"
           - ros-distro: humble
             ros-version: 2
             platform: "amd64"
-            base-image: "ubuntu:22.04"
           - ros-distro: rolling
             ros-version: 2
             platform: "amd64"
diff --git a/dockerfiles/tue-env.Dockerfile b/dockerfiles/tue-env.Dockerfile
index 5d761c1cc..5f123aa27 100644
--- a/dockerfiles/tue-env.Dockerfile
+++ b/dockerfiles/tue-env.Dockerfile
@@ -3,8 +3,8 @@
 #       Dockerfile to build working Ubuntu image with tue-env
 # ----------------------------------------------------------------
 
-# Set default base image to Ubuntu 20.04
-ARG BASE_IMAGE=ubuntu:20.04
+# Set default base image to Ubuntu 22.04
+ARG BASE_IMAGE=ubuntu:22.04
 FROM $BASE_IMAGE as base
 
 # ----------------------------------------------------------------