diff --git a/.github/workflows/quality-check.yaml b/.github/workflows/quality-check.yaml
index 1ff6c14..8fba4ba 100644
--- a/.github/workflows/quality-check.yaml
+++ b/.github/workflows/quality-check.yaml
@@ -50,30 +50,3 @@ jobs:
       # ------------ run tests
       - name: Run tests
         run: poetry run task test
-  pypi:
-    needs: check-and-test
-    if: ${{ github.event.release }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.7]
-        poetry-version: [1.1.6]
-    name: Release PyPi package
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      # ------------ Install poetry
-      - name: Setup pip/poetry
-        run: |
-          pip install -U pip poetry twine
-          poetry config virtualenvs.create false
-      # ------------ install tools
-      - name: Install building tools
-        run: |
-          sudo apt-get install build-essential
-          sudo apt-get install cmake g++-7
-      # ------------ build and install package
-      - name: Install package
-        run: poetry install
diff --git a/.github/workflows/upload-pypi.yaml b/.github/workflows/upload-pypi.yaml
index fd6c83e..3170693 100644
--- a/.github/workflows/upload-pypi.yaml
+++ b/.github/workflows/upload-pypi.yaml
@@ -19,14 +19,45 @@ on:
     tags:
       - "v*.*.*"
 
+
 jobs:
-  upload-pypi:
+  check-and-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.7]
         poetry-version: [1.1.6]
     name: Python-${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      # ------------ Install poetry
+      - name: Setup pip/poetry
+        run: |
+          pip install -U pip poetry twine
+          poetry config virtualenvs.create false
+      # ------------ install tools
+      - name: Install building tools
+        run: |
+          sudo apt-get install build-essential
+          sudo apt-get install cmake g++-7
+      # ------------ build and install package
+      - name: Install package
+        run: poetry install
+      # ------------ run tests
+      - name: Run tests
+        run: poetry run task test
+  pypi:
+    needs: check-and-test
+    if: ${{ github.event.release }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7]
+        poetry-version: [1.1.6]
+    name: Release PyPi package
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -45,8 +76,8 @@ jobs:
       # ------------ build and install package
       - name: Install package
         run: |
-            poetry install
-            poetry build
+          poetry install
+          poetry build
       # ------------ check version matches tag
       - name: Verify git tag vs. VERSION
         run: |
@@ -62,4 +93,3 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
-