diff --git a/.github/workflows/lint.yml b/.github/workflows/ci.yml
similarity index 75%
rename from .github/workflows/lint.yml
rename to .github/workflows/ci.yml
index 6ced459..a658cfb 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Lint and tag
+name: Lint, Test, Tag & Publish
 
 on:
   push:
@@ -63,3 +63,27 @@ jobs:
 
       - name: Push Tag
         run: git push origin ${{ steps.git_version.outputs.version }}
+
+  publish:
+    needs: tag
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.build.txt
+
+    - name: Build and publish
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}
+
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 65af29f..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Publish to pypi
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.build.txt
-
-    - name: Build and publish
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}