diff --git a/.github/workflows/build-pypi-package.yml b/.github/workflows/build-pypi-package.yml
index 3f2660e..24e9fe2 100644
--- a/.github/workflows/build-pypi-package.yml
+++ b/.github/workflows/build-pypi-package.yml
@@ -2,8 +2,8 @@ name: Publish Python distribution to PyPI and TestPyPI
 
 on:
   push:
-    branches:
-      - dev-pypi-release
+    tags:
+      - "v*.*.*"
 
 jobs:
   build:
@@ -12,11 +12,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: "3.x"
-
     - name: Install pypa/build
       run: >-
         python3 -m
@@ -31,47 +32,49 @@ jobs:
         name: python-package-distributions
         path: dist/
 
-    publish-to-pypi:
-      name: >-
-        Publish Python 🐍 distribution 📦 to PyPI
-      if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-      needs:
-        - build
-      runs-on: ubuntu-latest
-      environment:
-        name: pypi
-        url: https://pypi.org/p/RAPDOR
-      permissions:
-        id-token: write  # IMPORTANT: mandatory for trusted publishing
-      steps:
-        - name: Download all the dists
-          uses: actions/download-artifact@v3
-          with:
-            name: python-package-distributions
-            path: dist/
-        - name: Publish distribution 📦 to PyPI
-          uses: pypa/gh-action-pypi-publish@release/v1
+  publish-to-pypi:
+    name: >-
+      Publish Python 🐍 distribution 📦 to PyPI
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
+    needs:
+    - build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/RAPDOR  # Replace <package-name> with your PyPI project name
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution 📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
 
-      publish-to-testpypi:
-        name: Publish Python 🐍 distribution 📦 to TestPyPI
-        needs:
-          - build
-        runs-on: ubuntu-latest
+  publish-to-testpypi:
+    name: Publish Python 🐍 distribution 📦 to TestPyPI
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
+    needs:
+    - build
+    runs-on: ubuntu-latest
 
-        environment:
-          name: testpypi
-          url: https://test.pypi.org/p/RAPDOR
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/RAPDOR
 
-        permissions:
-          id-token: write  # IMPORTANT: mandatory for trusted publishing
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
 
-        steps:
-          - name: Download all the dists
-            uses: actions/download-artifact@v3
-            with:
-              name: python-package-distributions
-              path: dist/
-          - name: Publish distribution 📦 to TestPyPI
-            uses: pypa/gh-action-pypi-publish@release/v1
-            with:
-              repository-url: https://test.pypi.org/legacy/
\ No newline at end of file
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution 📦 to TestPyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/
\ No newline at end of file