diff --git a/.circleci/release.yml b/.circleci/release.yml
index cbe7c83..beffccd 100644
--- a/.circleci/release.yml
+++ b/.circleci/release.yml
@@ -91,7 +91,11 @@ commands:
               exit 0
             fi
 
-            TAG="<< parameters.package >>-v${VERSION}"
+            if [ "" = "<< parameters.package >>" ]; then 
+              TAG="v${VERSION}"
+            else
+              TAG="<< parameters.package >>-v${VERSION}"
+            fi
 
             # Fetch tags from remote
             git fetch --tags
diff --git a/PRLOG.md b/PRLOG.md
index b13744c..bb36bb2 100644
--- a/PRLOG.md
+++ b/PRLOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 👷 ci(circleci)-update release workflow configuration(pr [#155])
 - 👷 ci(circleci)-simplify nextsv version calculation(pr [#156])
 - 👷 ci(circleci)-add kdeets installation step to release workflow(pr [#157])
+- 👷 ci(circleci)-enhance tag generation logic(pr [#158])
 
 ### Fixed
 
@@ -445,6 +446,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#155]: https://github.com/jerus-org/cull-gmail/pull/155
 [#156]: https://github.com/jerus-org/cull-gmail/pull/156
 [#157]: https://github.com/jerus-org/cull-gmail/pull/157
+[#158]: https://github.com/jerus-org/cull-gmail/pull/158
 [Unreleased]: https://github.com/jerus-org/cull-gmail/compare/v0.0.16...HEAD
 [0.0.16]: https://github.com/jerus-org/cull-gmail/compare/v0.0.15...v0.0.16
 [0.0.15]: https://github.com/jerus-org/cull-gmail/compare/v0.0.14...v0.0.15