diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 0c400b256..eec5280b1 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -12,24 +12,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu16.04, ubuntu18.04 ]
-        gcc_version: [ '7', '8', '9', '10', '11' ]
+        os: [ ubuntu-20.04 ]
+        gcc: [ '7', '8', '9', '10', '11' ]
+        python: [ '3.9', '3.10', '3.11', '3.12' ]
         build_type: [ Debug, Release ]
 
-    name: Build on ${{ matrix.os }} (${{ matrix.build_type }}) with GCC ${{ matrix.gcc_version }}
-    runs-on: ubuntu-latest
-    container:
-      image: conanio/gcc${{ matrix.gcc_version }}-${{ matrix.os }}
-      options: --user root
+    name: Build on ${{ matrix.os }} (${{ matrix.build_type }}) with GCC ${{ matrix.gcc }} for Python ${{ matrix.python}}
+    runs-on: ${{ matrix.os}}
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: ${{ matrix.gcc }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+          cache: 'pip'
 
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade conan cmake ninja
+          pip install conan cmake ninja
 
       - name: Build with Conan
         run: |
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index eed3bd329..da6d78ea8 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -13,9 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-2019, windows-2022 ]
+        python: [ '3.9', '3.10', '3.11', '3.12' ]
         build_type: [ Debug, Release ]
 
-    name: Build on ${{ matrix.os }} (${{ matrix.build_type }})
+    name: Build on ${{ matrix.os }} (${{ matrix.build_type }}) for Python ${{ matrix.python }}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -25,7 +26,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ matrix.python }}
           cache: 'pip'
 
       - name: Install Dependencies