diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d04fadbf..31ce026d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,15 +82,21 @@ jobs:
         name: wrappers_ubuntu_22_04
         path: generated_cpp
 
-  centos:
+  oldschool:
     strategy:
       fail-fast: false
       matrix:
-        container:
-        - 'centos:7'
+        container_os: ['centos']
+        container_os_version: ['7']
+        container_os_python_package: ['python-debug']
         configuration: ['debug', 'release']
+        include:
+          - container_os: 'rockylinux'
+            container_os_version: '9'
+            container_os_python_package: 'python3-devel'
+            configuration: 'release'
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
+    container: '${{ matrix.container_os }}:${{ matrix.container_os_version }}'
     steps:
     - name: Install Qt
       run: |
@@ -98,7 +104,7 @@ jobs:
         yum groupinstall "Development Tools" -y
         yum install -y \
         which \
-        python-debug \
+        ${{ matrix.container_os_python_package }} \
         qt5-qtbase-* \
         qt5-qttools* \
         qt5-qtsvg \
@@ -114,13 +120,14 @@ jobs:
       run: |
         export QT_SELECT=qt5
         echo ======= SYSTEM INFO ========
-        uname -a; gcc --version | grep "gcc"; python --version; qmake-qt5 --version
+        which python 2>/dev/null && export PYTHON_VERSION_SUFFIX= || export PYTHON_VERSION_SUFFIX=3
+        uname -a; gcc --version | grep "gcc"; python${PYTHON_VERSION_SUFFIX} --version; qmake-qt5 --version
         echo ============================
         qmake-qt5 -r PythonQt.pro CONFIG+=${{ matrix.configuration }} \
-          PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
-          PYTHON_DIR=$(which python | xargs dirname | xargs dirname)
+          PYTHON_VERSION=$(python${PYTHON_VERSION_SUFFIX} --version | cut -d " " -f 2 | cut -d "." -f1,2) \
+          PYTHON_DIR=$(which python${PYTHON_VERSION_SUFFIX} | xargs dirname | xargs dirname)
         make -j 2 && make check TESTARGS="-platform offscreen"
-      
+
     - name: Generate Wrappers
       run: |
         # workaround to allow to find the Qt include dirs for installed standard qt packages
@@ -128,26 +135,22 @@ jobs:
         export QTDIR=/usr/include/qt5ln
         cd generator
         ./pythonqt_generator
-        
+
     - name: Upload Wrappers
       uses: actions/upload-artifact@v3
       with:
-        name: wrappers_centos7
+        name: wrappers_${{ matrix.container_os }}-${{ matrix.container_os_version }}_${{ matrix.configuration }}
         path: generated_cpp
 
   macOS:
     strategy:
       fail-fast: false
       matrix:
-       macos-version:  ['10.15']
-       python-version: ['2.7']
+       macos-version:  ['11']
+       python-version: ['3.6']
        qt-version: ['5.9.*']
        configuration: ['release','debug']
        include:
-         - macos-version: '11'
-           python-version: '3.6'
-           qt-version: '5.11.*'
-           configuration: 'release'
          - macos-version: '12'
            python-version: '3.11'
            qt-version: '5.12.*'
@@ -241,7 +244,7 @@ jobs:
 #           msvc-toolset: '14.16'
 
          - qt-arch: 'win32_mingw53'
-           python-version: '2.7'
+           python-version: '3.6'
            python-arch: 'x86'
            qt-version: '5.11.*'