diff --git a/.github/workflows/publish-crate.yml b/.github/workflows/publish-crate.yml
index 68d887b..41cc475 100644
--- a/.github/workflows/publish-crate.yml
+++ b/.github/workflows/publish-crate.yml
@@ -14,7 +14,7 @@ on:
     - 'osdpctl-v*'
   workflow_dispatch:
     inputs:
-      tags:
+      tag:
         description: 'Tag'
         required: true
 
@@ -30,7 +30,16 @@ jobs:
       with:
         toolchain: stable
         override: true
-    - run: cargo publish --token ${CRATES_TOKEN} -p $(echo ${REL_TAG} | perl -pe 's/([a-z\-]+)-v.*/\1/')
+    - name: "Setup environment"
+      if: github.ref == 'refs/heads/master'
+      run: echo "TAG=${TRIGGER_TAG}" >> "${GITHUB_ENV}"
+      else:
+      run: echo "TAG=${REL_TAG}" >> "${GITHUB_ENV}"
       env:
-        CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         REL_TAG: ${{ github.ref_name }}
+        TRIGGER_TAG: ${{ github.event.inputs.tag }}
+    - name: "Publish crate"
+      run: |
+        cargo publish --token ${CRATES_TOKEN} -p $(echo ${TAG} | perl -pe 's/([a-z\-]+)-v.*/\1/')
+      env:
+        CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}