diff --git a/.github/workflows/build-wheels-defined.yml b/.github/workflows/build-wheels-defined.yml
index 60baaba..0bf2d07 100644
--- a/.github/workflows/build-wheels-defined.yml
+++ b/.github/workflows/build-wheels-defined.yml
@@ -291,10 +291,9 @@ jobs:
           name: wheels-download-directory-linux-arm64-${{ matrix.python-version }}
           path: ./downloaded_wheels
 
-# TODO Uncomment this when we are ready to upload the wheels
-  # upload-python-wheels:
-  #   if: ${{ always() }}
-  #   needs: [get-supported-versions, ubuntu-latest, windows-latest, macos-latest, macos-m1, linux-armv7, linux-arm64]
-  #   name: Upload Python wheels
-  #   uses: espressif/idf-python-wheels/.github/workflows/upload-python-wheels.yml@main
-  #   secrets: inherit
+  upload-python-wheels:
+    if: ${{ always() }}
+    needs: [get-supported-versions, ubuntu-latest, windows-latest, macos-latest, macos-m1, linux-armv7, linux-arm64]
+    name: Upload Python wheels
+    uses: espressif/idf-python-wheels/.github/workflows/upload-python-wheels.yml@main
+    secrets: inherit
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
deleted file mode 100644
index c17f516..0000000
--- a/.github/workflows/create-release.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: create-release
-
-on:
-  push:
-    tags:
-    - 'v*'
-
-jobs:
-  create_release:
-    name: Create release
-    runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false
diff --git a/.github/workflows/update-python-versions.yml b/.github/workflows/update-python-versions.yml
index 44f5557..1462ef9 100644
--- a/.github/workflows/update-python-versions.yml
+++ b/.github/workflows/update-python-versions.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install requests python-dateutil
+          python -m pip install requests python-dateutil colorama
 
       - name: Generate supported versions
         id: generate
diff --git a/build_wheels.py b/build_wheels.py
index a047508..1705c75 100644
--- a/build_wheels.py
+++ b/build_wheels.py
@@ -284,6 +284,8 @@ def build_wheels(requirements: set, local_links: bool = True) -> dict:
                         f"{requirement}",
                         "--find-links",
                         f"{dir}",
+                        "--find-links",
+                        "https://pypi.org/simple/",
                         "--wheel-dir",
                         f"{dir}",
                         f"{argument}",
@@ -308,6 +310,8 @@ def build_wheels(requirements: set, local_links: bool = True) -> dict:
                 f"{requirement}",
                 "--find-links",
                 f"{dir}",
+                "--find-links",
+                "https://pypi.org/simple/",
                 "--wheel-dir",
                 f"{dir}",
             ],
diff --git a/create_index_pages.py b/create_index_pages.py
index 479508a..3fb4a23 100644
--- a/create_index_pages.py
+++ b/create_index_pages.py
@@ -66,7 +66,7 @@ def _html_loader(path: str) -> str:
 for name in packages_new.keys():
     index.append(f'        <a href="/pypi/{name}/">{name}/</a>')
     index_pretty.append(
-        f'        <div><a href="/pypi/{name}">{name}</a><span>Entries: {len(packages_new[name])}</span></div><br>'
+        f'        <div><a href="/pypi/{name}">{name}</a><span>Entries: {len(packages_new[name]) - 1}</span></div><br>'
     )
 index.append(HTML_FOOTER)
 index_pretty.append(HTML_FOOTER)
diff --git a/exclude_list.yaml b/exclude_list.yaml
index f1634e9..fab6170 100644
--- a/exclude_list.yaml
+++ b/exclude_list.yaml
@@ -74,3 +74,18 @@
 
 # Esptool wheels many times are faulty. Mostly because it installs "esptool.py" which collides with the package name.
 - package_name: 'esptool'
+
+# pytest-embedded-xxx is not supported by some older Pythons
+# https://pypi.org/project/pytest-embedded-idf/#history
+- package_name: 'pytest-embedded-idf'
+  version: '>1.17.0'
+  python: ['==3.8', '==3.9']
+- package_name: 'pytest-embedded-jtag'
+  version: '>1.17.0'
+  python: ['==3.8', '==3.9']
+- package_name: 'pytest-embedded-qemu'
+  version: '>1.17.0'
+  python: ['==3.8', '==3.9']
+- package_name: 'pytest-embedded-serial-esp'
+  version: '>1.17.0'
+  python: ['==3.8', '==3.9']