diff --git a/.github/workflows/ci-tags.yml b/.github/workflows/ci-tags.yml
new file mode 100644
index 0000000..30f41fd
--- /dev/null
+++ b/.github/workflows/ci-tags.yml
@@ -0,0 +1,32 @@
+---
+name: ci-tags
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '**'
+
+jobs:
+  build-tag:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Build docker image
+        run: |
+          DOCKER_BUILDKIT=1 docker build \
+            --build-arg BUILDKIT_INLINE_CACHE=1 \
+            --build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \
+            --build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \
+            --target=runtime
+            --tag=dannecron/coverage-merger:latest \
+            --file=./.github/Dockerfile .
+      - name: Login to docker hub
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push docker image to docker-hub
+        uses: actions-hub/docker@master
+        with:
+          args: push dannecron/coverage-merger:${{ github.ref_name }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8850126..1529842 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,13 +6,10 @@ on:
   push:
     branches:
       - '**'
-    tags:
-      - '**'
 
 jobs:
   tests:
     runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && contains(github.ref, 'refs/heads/')
     strategy:
       matrix:
         php_version: ['8.1', '8.2']
@@ -30,7 +27,6 @@ jobs:
         run: composer run pest-coverage
   lint:
     runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && contains(github.ref, 'refs/heads/')
     strategy:
       matrix:
         php_version: ['80100', '80200']
@@ -45,7 +41,6 @@ jobs:
 
   analyze:
     runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && contains(github.ref, 'refs/heads/')
     container: dannecron/php-for-dev:8.2
     steps:
       - name: Check out repository
@@ -83,28 +78,3 @@ jobs:
         uses: actions-hub/docker@master
         with:
           args: push dannecron/coverage-merger:latest
-
-  build-tag:
-    runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - name: Build docker image
-        run: |
-          DOCKER_BUILDKIT=1 docker build \
-            --build-arg BUILDKIT_INLINE_CACHE=1 \
-            --build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \
-            --build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \
-            --target=runtime
-            --tag=dannecron/coverage-merger:latest \
-            --file=./.github/Dockerfile .
-      - name: Login to docker hub
-        uses: actions-hub/docker/login@master
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Push docker image to docker-hub
-        uses: actions-hub/docker@master
-        with:
-          args: push dannecron/coverage-merger:${{ github.ref_name }}