diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0d9894e76..43be409301 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -512,7 +512,7 @@ workflows:
               only:
                 - main
             tags:
-              only: /^v*/
+              only: /^v.*/
       - build_conda:
           name: conda_build_cu116_1.12.1
           dockerimage: pytorch/conda-builder:cuda116
@@ -523,7 +523,7 @@ workflows:
               only:
                 - main
             tags:
-              only: /^v*/
+              only: /^v.*/
       - build_conda:
           name: conda_build_cu116_1.13.1
           dockerimage: pytorch/conda-builder:cuda116
@@ -534,7 +534,7 @@ workflows:
               only:
                 - main
             tags:
-              only: /^v*/
+              only: /^v.*/
       - build_conda:
           name: conda_build_cu117_1.13.1
           dockerimage: pytorch/conda-builder:cuda117
@@ -545,7 +545,7 @@ workflows:
               only:
                 - main
             tags:
-              only: /^v*/
+              only: /^v.*/
       - binary_linux_wheel:
           python_version: "3.7"
           name: binary_linux_wheel_py37_cu102
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b5f5c77511..8c8faf2743 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -19,7 +19,7 @@ env:
   DISTUTILS_USE_SDK: 1 # otherwise distutils will complain on windows about multiple versions of msvc
   XFORMERS_BUILD_TYPE: "Release"
   TWINE_USERNAME: __token__
-  XFORMERS_PACKAGE_FROM: "wheel"
+  XFORMERS_PACKAGE_FROM: "wheel-${{ github.ref_name }}"
 
 jobs:
   build_wheels:
@@ -118,13 +118,13 @@ jobs:
           path: dist/*.whl
 
       - name: Upload wheel to PyPi
-        if: ${{ github.ref_name == 'main' && matrix.config.publish }}
+        if: ${{ matrix.config.publish }}
         run: $PY -m twine upload dist/*.whl
         env:
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
 
       - name: Upload source distribution to PyPi
-        if: ${{ github.ref_name == 'main' && matrix.config.publish && matrix.sdist }}
+        if: ${{ matrix.config.publish && matrix.sdist }}
         run: |
           rm -rf dist/
           # unpin pytorch version