diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 8359dbb..95e2f3b 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -23,13 +23,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache Python
-        uses: actions/cache@v2.1.3
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-pip-${{ matrix.python }}-${{ github.sha }}
-
       - name: Install python dependencies
         run: |
           ${{ matrix.pip }} install --user --upgrade pip
@@ -37,6 +30,7 @@ jobs:
           ${{ matrix.pip }} --no-cache-dir install --user -r requirements.txt
 
       - name: Show python dependencies
+        run: |
           ${{ matrix.python }} --version
           ${{ matrix.pip }} freeze
 
@@ -71,25 +65,24 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python 2.7
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 2.7
-
-      - name: Cache Python Dependencies
-        uses: actions/cache@v2.1.3
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-pip-2.7-${{ github.sha }}
+          python-version: 3.8
 
       - name: Install python dependencies
-        uses: ./.github/actions/install-python-dependencies
+        run: |
+          python -m pip install --user --upgrade pip
+          pip --no-cache-dir install --user setuptools wheel "urllib3==1.25.11"
+          pip --no-cache-dir install --user -r requirements.txt
 
       - name: Build package
-        run: python setup.py sdist bdist_wheel
+        run: |
+          mkdir clean-build
+          python setup.py sdist bdist_wheel --universal --dist-dir ./clean-build
 
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@v1.3.1
         with:
           user: __token__
           password: ${{ secrets.PYPI_PASSWORD }}
+          packages_dir: clean-build/
diff --git a/setup.cfg b/setup.cfg
index 3828eed..8f2c609 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,4 +31,4 @@ include = inspire_json_merger/*.py
 addopts = --cov=inspire_json_merger --cov-report=term-missing:skip-covered
 
 [flake8]
-ignore = *.py E501 FI12 FI14 FI15 FI16 FI17 FI18 FI50 FI51 FI53
+ignore = E501 FI12 FI14 FI15 FI16 FI17 FI18 FI50 FI51 FI53
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index 588b4cb..7108a6e 100644
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -543,7 +543,7 @@ def test_grobid_on_arxiv_operations_doesnt_conflict_on_author_full_name():
                 "emails": [
                     "sulkowski.p@fuw.edu.pl"
                 ],
-                "full_name":"Sułkowski, Piotr"
+                "full_name": "Sułkowski, Piotr"
             }
         ]
     }