diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a8c3757..6c16250 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2022, windows-2019, windows-2016, macos-10.15]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, windows-2019, windows-2016, macos-12, macos-11, macos-10.15]
     steps:
     - uses: actions/checkout@v2
     - name: Show initial environment
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
         cmp: [gcc, clang]
         configuration: [default, static, debug, static-debug]
     steps:
@@ -50,37 +50,6 @@ jobs:
     - name: Collect and show test results
       run: python cue.py test-results
 
-  build-linux-old:
-    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    env:
-      CMP: ${{ matrix.cmp }}
-      BCFG: ${{ matrix.configuration }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-16.04]
-        cmp: ["gcc-4.8", "gcc-4.9"]
-        configuration: [default, static]
-    steps:
-    - uses: actions/checkout@v2
-    - name: "apt-get install ${{ matrix.cmp }}"
-      run: |
-        export GCC_NAME="${{ matrix.cmp }}"
-        sudo apt-get update
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install g++-${GCC_NAME#gcc-}
-    - name: Prepare and compile dependencies
-      run: python cue.py prepare
-    - name: Build main module (example app)
-      run: python cue.py build
-    - name: Run main module tests
-      run: python cue.py -T 15M test
-    - name: Collect and show test results
-      run: python cue.py test-results
-
   build-macos:
     name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -90,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15]
+        os: [macos-12, macos-11, macos-10.15]
         cmp: [clang]
         configuration: [default, debug]
     steps:
diff --git a/github-actions/ci-scripts-build.yml.example-full b/github-actions/ci-scripts-build.yml.example-full
index 515ea67..e2d0ad9 100644
--- a/github-actions/ci-scripts-build.yml.example-full
+++ b/github-actions/ci-scripts-build.yml.example-full
@@ -59,10 +59,10 @@ jobs:
             extra: "CMD_CXXFLAGS=-std=c++11"
             name: "Ub-20 gcc-9 C++11, static"
 
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             cmp: clang
             configuration: default
-            name: "Ub-16 clang-9"
+            name: "Ub-18 clang-9"
 
           - os: ubuntu-20.04
             cmp: clang
@@ -97,18 +97,6 @@ jobs:
             test: NO
             name: "Ub-20 gcc-9 + RT-5.1 beatnik"
 
-          - os: ubuntu-16.04
-            cmp: gcc-4.8
-            utoolchain: true
-            configuration: default
-            name: "Ub-16 gcc-4.8"
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.9
-            utoolchain: true
-            configuration: default
-            name: "Ub-16 gcc-4.9"
-
           - os: ubuntu-18.04
             cmp: gcc
             configuration: default