diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 789f3d6f..a15a0a78 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -23,12 +23,12 @@ env:
 jobs:
   lint:
     name: Lint sources
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out sources
         uses: actions/checkout@v4
       - name: Prepare container
-        run: ./scripts/prepare-container-focal.sh
+        run: ./scripts/prepare-container-jammy.sh
       - run: bundle install
       - run: bundle exec danger || true
       - run: BML_OPENMP=no EMACS=emacs27 ./build.sh --debug check_indent
@@ -42,12 +42,12 @@ jobs:
 
   docs:
     name: Build docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out sources
         uses: actions/checkout@v4
       - name: Prepare container
-        run: ./scripts/prepare-container-focal.sh
+        run: ./scripts/prepare-container-jammy.sh
       - name: Build docs
         run: ./build.sh --debug docs
 
@@ -90,7 +90,7 @@ jobs:
 
   build:
     name: Build and test the library (${{ matrix.JOBNAME }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -145,7 +145,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Prepare container
-        run: ./scripts/prepare-container-focal.sh
+        run: ./scripts/prepare-container-jammy.sh
       - name: Build and test library
         env:
           BLAS_VENDOR: ${{ matrix.BLAS_VENDOR || env.BLAS_VENDOR }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7547be3..0d6a0014 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,8 @@ if (MACRO_PREFIX_MAP_FLAG_WORKS)
 endif()
 
 set(GNU_C_FLAGS_DEBUG -O0 -g -Wall -Wimplicit -Werror=implicit
-  -Wunused-variable -Wno-unknown-pragmas -save-temps -std=c99
+  -Wunused-variable -Wno-unknown-pragmas -save-temps -gno-record-gcc-switches
+  -std=c99 -gdwarf-4
   ${MACRO_PREFIX_MAP_FLAG})
 set(GNU_C_FLAGS_RELEASE -O3 -g -std=c99 -DNDEBUG
   ${MACRO_PREFIX_MAP_FLAG})
@@ -79,7 +80,7 @@ set(XL_Fortran_FLAGS_DEBUG -O0 -g)
 set(XL_Fortran_FLAGS_RELEASE -O3 -g)
 set(XL_Fortran_FLAGS_RELWITHDEBINFO -O3 -g -DNDEBUG)
 
-set(Clang_C_FLAGS_DEBUG -O0 -g -save-temps -std=gnu99)
+set(Clang_C_FLAGS_DEBUG -O0 -g -save-temps -std=gnu99 -gno-record-gcc-switches -gdwarf-4)
 set(Clang_C_FLAGS_RELEASE -O2 -g -DNDEBUG -std=gnu99)
 set(Clang_C_FLAGS_RELWITHDEBINFO -O2 -g -DNDEBUG -std=gnu99)