diff --git a/autoinstallation/package/_service b/autoinstallation/package/_service
index 264b36d000..5cf74bdfbf 100644
--- a/autoinstallation/package/_service
+++ b/autoinstallation/package/_service
@@ -3,7 +3,7 @@
     <!-- the URL is modified by the .github/workflows/obs-staging-shared.yml
     action when submitting to OBS -->
     <param name="url">https://github.com/agama-project/agama.git</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>    
     <param name="scm">git</param>
     <!-- the revision might be changed to "release" branch or a git tag by the
diff --git a/products.d/_service b/products.d/_service
index 881ad3ee34..ab4a88bbcc 100644
--- a/products.d/_service
+++ b/products.d/_service
@@ -3,7 +3,7 @@
     <!-- the URL is modified by the .github/workflows/obs-staging-shared.yml
     action when submitting to OBS -->
     <param name="url">https://github.com/agama-project/agama.git</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="scm">git</param>
     <!-- the revision might be changed to "release" branch or a git tag by the
diff --git a/rust/package/_service b/rust/package/_service
index 0c4798cd4c..f238ce98d6 100644
--- a/rust/package/_service
+++ b/rust/package/_service
@@ -3,7 +3,7 @@
     <!-- the URL is modified by the .github/workflows/obs-staging-shared.yml
     action when submitting to OBS -->
     <param name="url">https://github.com/agama-project/agama.git</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>    
     <param name="scm">git</param>
     <!-- the revision might be changed to "release" branch or a git tag by the
diff --git a/service/agama-yast.gemspec b/service/agama-yast.gemspec
index 99e3f6a9a6..6a39e7a365 100644
--- a/service/agama-yast.gemspec
+++ b/service/agama-yast.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   if File.exist?(File.join(__dir__, "../.git"))
     # the version is <version_tag>.devel<number_of_commits_since_the_tag>
     # or just <version_tag> if there are no additional commits
-    spec.version = `git describe --tags --match "v[0-9]*"`.chomp.sub(/^v/, "").sub(/-([0-9]+)-g\h+\Z/, ".devel\\1")
+    spec.version = `git describe --tags --match "v[0-9]*"`.chomp.sub(/^v/, "").sub(/-([0-9]+)-g(\h+)\Z/, ".devel\\1.\\2")
   else
     # running in yupdate script, use a fake version
     spec.version = "99.yupdate"
diff --git a/web/package/_service b/web/package/_service
index 0e4837cff3..a9a27f9cbf 100644
--- a/web/package/_service
+++ b/web/package/_service
@@ -1,6 +1,6 @@
 <services>
   <service name="obs_scm" mode="manual">
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <!-- the URL is modified by the .github/workflows/obs-staging-shared.yml
     action when submitting to OBS -->