diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml
new file mode 100644
index 00000000..757ae90f
--- /dev/null
+++ b/.github/workflows/cd-manual.yml
@@ -0,0 +1,36 @@
+name: Create docker images
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        type: string
+        description: Version
+        required: true
+      add-latest:
+        type: boolean
+        description: Add latest tag
+        required: false
+
+jobs:
+  build:
+    name: Build, push, and deploy
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        db-type: [postgresql, mysql]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: mr-smithers-excellent/docker-build-push@v5
+        name: Build & push Docker image for ${{ matrix.db-type }}
+        with:
+          image: umami
+          tags: ${{ matrix.db-type }}-${{ inputs.version }}
+          addLatest: ${{ inputs.add-latest }}
+          buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
+          registry: ghcr.io/${{ github.actor }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 757ae90f..229b295b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,20 +1,12 @@
 name: Create docker images
 
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        type: string
-        description: Version
-        required: true
-      add-latest:
-        type: boolean
-        description: Add latest tag
-        required: false
+on: [create]
 
 jobs:
+
   build:
     name: Build, push, and deploy
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -24,12 +16,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
       - uses: mr-smithers-excellent/docker-build-push@v5
         name: Build & push Docker image for ${{ matrix.db-type }}
         with:
           image: umami
-          tags: ${{ matrix.db-type }}-${{ inputs.version }}
-          addLatest: ${{ inputs.add-latest }}
+          tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: ghcr.io/${{ github.actor }}
           username: ${{ github.actor }}