diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
index 3a4b34d..f5093db 100644
--- a/.github/workflows/test-package.yml
+++ b/.github/workflows/test-package.yml
@@ -6,7 +6,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  create_matrix:
+
+  prepare:
     
     runs-on: ubuntu-latest  
     steps:
@@ -14,7 +15,8 @@ jobs:
         uses: actions/checkout@v2
       
       - name: Create matrix
-        uses: fabiocaccamo/create-matrix-action@v1
+        uses: fabiocaccamo/create-matrix-action@v2
+        id: create_matrix
         with:
           matrix: |
             python-version {2.7}, django-version {1.8,1.9,1.10,1.11}, database {sqlite,postgres}
@@ -23,23 +25,18 @@ jobs:
             python-version {3.8}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
             python-version {3.9}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
             python-version {3.10}, django-version {3.2,4.0}, database {sqlite,postgres}
-
-      - name: Set matrix output variable 
-        id: set_matrix
-        run: |
-          echo "::set-output name=matrix::$(cat ./matrix.json)" 
      
     outputs:
-      matrix: ${{ steps.set_matrix.outputs.matrix }}
+      matrix: ${{ steps.create_matrix.outputs.matrix }}
         
-  run_tests:
+  test:
   
-    needs: create_matrix
+    needs: prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: 
-        include: ${{fromJson(needs.create_matrix.outputs.matrix)}}
+        include: ${{fromJson(needs.prepare.outputs.matrix)}}
 
     services:
       postgres:
@@ -55,13 +52,7 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v1
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip'
+    - uses: actions/checkout@v2
 
     - name: Install psycopg2 prerequisites
       run: sudo apt-get install libpq-dev