diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1d434784..591bfb4c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -109,17 +109,19 @@ jobs:
           name: ${{ github.job }}
           path: ${{ github.workspace }}/build-static/
   build-ctc-decoder-Linux:
-    name: "Lin|Build CTC decoder Python package for testing"
+    name: "Lin|Build CTC decoder Python package"
     needs: [ swig_Linux ]
     runs-on: ubuntu-20.04
-    if: ${{ github.event_name == 'pull_request' }}
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
       - run: |
           python --version
           pip --version
@@ -135,17 +137,17 @@ jobs:
       - id: get_numpy
         uses: ./.github/actions/numpy_vers
         with:
-          pyver: 3.6
+          pyver: ${{ matrix.python-version }}
       - name: Make decoder package
         run: |
-          NUMPY_BUILD_VERSION=${{ steps.get_numpy.outputs.build_version }} \
-          NUMPY_DEP_VERSION=${{ steps.get_numpy.outputs.dep_version }} \
+          NUMPY_BUILD_VERSION="${{ steps.get_numpy.outputs.build_version }}" \
+          NUMPY_DEP_VERSION="${{ steps.get_numpy.outputs.dep_version }}" \
           make -C native_client/ctcdecode/ \
             NUM_PROCESSES=$(nproc) \
             bindings
       - uses: actions/upload-artifact@v2
         with:
-          name: "coqui_stt_ctcdecoder-Linux-test.whl"
+          name: "coqui_stt_ctcdecoder-Linux-${{ matrix.python-version }}.whl"
           path: ${{ github.workspace }}/native_client/ctcdecode/dist/*.whl
       - run: |
           make -C native_client/ctcdecode clean-keep-third-party
@@ -166,7 +168,7 @@ jobs:
           python-version: 3.6
       - uses: actions/download-artifact@v2
         with:
-          name: "coqui_stt_ctcdecoder-Linux-test.whl"
+          name: "coqui_stt_ctcdecoder-Linux-3.6.whl"
       - run: |
           python --version
           pip --version
@@ -649,17 +651,19 @@ jobs:
           name: ${{ github.job }}
           path: ${{ github.workspace }}/build-static/
   build-ctc-decoder-macos:
-    name: "Mac|Build CTC decoder Python package for testing"
+    name: "Mac|Build CTC decoder Python package"
     needs: [ swig_macOS ]
     runs-on: macos-10.15
-    if: ${{ github.event_name == 'pull_request' }}
+    strategy:
+      matrix:
+        python-version: [3.6.8, 3.7.9, 3.8.9, 3.9.4]
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/install-python-upstream
         with:
-          version: 3.6.8
+          version: ${{ matrix.python-version }}
       - run: |
           python --version
           pip --version
@@ -675,17 +679,17 @@ jobs:
       - id: get_numpy
         uses: ./.github/actions/numpy_vers
         with:
-          pyver: 3.6.8
+          pyver: ${{ matrix.python-version }}
       - name: Make decoder package
         run: |
-          NUMPY_BUILD_VERSION=${{ steps.get_numpy.outputs.build_version }} \
-          NUMPY_DEP_VERSION=${{ steps.get_numpy.outputs.dep_version }} \
+          NUMPY_BUILD_VERSION="${{ steps.get_numpy.outputs.build_version }}" \
+          NUMPY_DEP_VERSION="${{ steps.get_numpy.outputs.dep_version }}" \
           make -C native_client/ctcdecode/ \
             NUM_PROCESSES=$(sysctl hw.ncpu |cut -d' ' -f2) \
             bindings
       - uses: actions/upload-artifact@v2
         with:
-          name: "coqui_stt_ctcdecoder-macOS-test.whl"
+          name: "coqui_stt_ctcdecoder-macOS-${{ matrix.python-version }}.whl"
           path: ${{ github.workspace }}/native_client/ctcdecode/dist/*.whl
       - run: |
           make -C native_client/ctcdecode clean-keep-third-party
@@ -703,18 +707,18 @@ jobs:
           fetch-depth: 1
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.7
       - uses: actions/download-artifact@v2
         with:
-          name: "coqui_stt_ctcdecoder-macOS-test.whl"
+          name: "coqui_stt_ctcdecoder-macOS-3.7.9.whl"
       - run: |
           python --version
-          pip --version
+          python -m pip --version
       - run: |
-          pip install --upgrade pip==19.3.1 setuptools==45.0.0 wheel==0.33.6
+          python -m pip install -U pip setuptools wheel
       - run: |
-          pip install coqui_stt_ctcdecoder-*-cp36-cp36m-*_x86_64.whl
-          DS_NODECODER=y pip install --upgrade .
+          python -m pip install coqui_stt_ctcdecoder-*.whl
+          DS_NODECODER=y python -m pip install --upgrade .
       - run: |
           bits=""
           if [ "${{ matrix.bitrate }}" = "8k" ]; then
@@ -848,13 +852,13 @@ jobs:
           name: "libstt.${{ matrix.build-flavor }}.zip"
           path: ${{ github.workspace }}/artifacts/libstt.zip
   build-python-macOS:
-    name: "Mac|Build python bindings"
+    name: "Mac|Build Python bindings"
     runs-on: macos-10.15
     needs: [ build-lib_macOS, swig_macOS ]
     strategy:
       matrix:
         build-flavor: ["tf", "tflite"]
-        python-version: [3.6.8, 3.7.9, 3.8.8, 3.9.2]
+        python-version: [3.6.8, 3.7.9, 3.8.9, 3.9.4]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -999,7 +1003,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     strategy:
       matrix:
-        python-version: [3.6.8, 3.7.9, 3.8.8, 3.9.2]
+        python-version: [3.6.8, 3.7.9, 3.8.9, 3.9.4]
         build-flavor: ["tf", "tflite"]
         models: ["test", "prod"]
         bitrate: ["8k", "16k"]