diff --git a/.github/workflows/create_draft_release.yml b/.github/workflows/create_draft_release.yml
index 221d5f9d..58716ec5 100644
--- a/.github/workflows/create_draft_release.yml
+++ b/.github/workflows/create_draft_release.yml
@@ -14,17 +14,11 @@
 name: Create Draft Release
 
 on:
-  workflow_dispatch: # input version manually. Overrides push tag
-    inputs:
-      tag:
-        description: "Release version, eg:latest, 0.2.1"
-        required: true
-        default: "0.0.0"
+  workflow_dispatch: # select tag when creating
+  push:
+   tags:
+     - "*.*.*"
 
-  # As of today trigger only manually
-  #push:
-  #  tags:
-  #    - "*.*.*"
 
 # Needed if GITHUB_TOKEN by default do not have right to create release
 permissions:
@@ -87,8 +81,7 @@ jobs:
              ls -R build-artifacts
              cd build-artifacts
              # Rename, add release name (usually tag)
-             for f in databroker*.tar.gz; do mv "$f" "$(echo "$f" | sed s/.tar.gz/-${{ needs.get_version.outputs.version }}.tar.gz/)"; done
-
+             for f in databroker*.tar.gz; do mv "$f" "$(echo "$f" | sed s/.tar.gz/-${{ github.ref_name }}.tar.gz/)"; done
 
       - name: Create release
         id: create_release
@@ -96,7 +89,7 @@ jobs:
         # if: startsWith(github.ref, 'refs/tags/'
         with:
           draft: true
-          tag_name: KUKSA Databroker ${{ needs.get_version.outputs.version }}
+          name: KUKSA Databroker ${{ github.ref_name }}
           fail_on_unmatched_files: true
           files: |
             build-artifacts/*