diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a9509bce..f0cb2e87 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -3,13 +3,18 @@ name: Create docker images
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
   workflow_dispatch:
     inputs:
       version:
-        description: 'Optional image version (e.g. 3.0.0, v3.0.0, or 3.0.0-beta.1)'
+        description: "Optional image version (e.g. 3.0.0, v3.0.0, or 3.0.0-beta.1)"
         required: false
-        default: ''
+        default: ""
+      include_latest:
+        description: "Include latest tag"
+        required: false
+        type: boolean
+        default: true
 
 jobs:
   build:
@@ -46,6 +51,7 @@ jobs:
           INPUT="${{ github.event.inputs.version }}"
           REF_TYPE="${{ github.ref_type }}"
           REF_NAME="${{ github.ref_name }}"
+          INCLUDE_LATEST="${{ github.event.inputs.include_latest }}"
 
           # Determine version source
           if [[ -n "$INPUT" ]]; then
@@ -66,8 +72,13 @@ jobs:
               # prerelease: only version tag
               TAGS="$VERSION"
             else
-              # stable release: version + hierarchy + latest
-              TAGS="$VERSION,${MAJOR}.${MINOR},${MAJOR},postgresql-latest,latest"
+              # stable release: version + hierarchy
+              TAGS="$VERSION,${MAJOR}.${MINOR},${MAJOR},postgresql-latest"
+              
+              # Add latest tag based on trigger and input
+              if [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then
+                TAGS="${TAGS},latest"
+              fi
             fi
           else
             # Non-tag build (e.g. from main branch)
diff --git a/package.json b/package.json
index 39ed6e86..76b1e1fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "A modern, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",