diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai
index 5059508641..72dee90d6d 100644
--- a/anda/system/xone/akmod/update.rhai
+++ b/anda/system/xone/akmod/update.rhai
@@ -1,8 +1,3 @@
-rpm.global("commit", gh_commit("dlundqvist/xone"));
-if rpm.changed() {
-    rpm.release();
-    rpm.global("date", date());
-    let ver = gh_tag("dlundqvist/xone");
-    ver.crop(1);
-    rpm.global("ver", ver);
-}
+import "andax/bump_extras.rhai" as bump;
+
+rpm.version(bump::madoguchi("xone-kmod-common", labels.branch));
diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec
index 503b7e97c1..969e2364d3 100644
--- a/anda/system/xone/akmod/xone-kmod.spec
+++ b/anda/system/xone/akmod/xone-kmod.spec
@@ -9,7 +9,7 @@
 %global debug_package %{nil}
 
 Name:           xone-kmod
-Version:        %{ver}%{!?tag:^%{date}git%{shortcommit}}
+Version:        %{ver}^%{date}git%{shortcommit}
 Release:        1%{?dist}
 Summary:        Linux kernel driver for Xbox One and Xbox Series X|S accessories
 License:        GPL-2.0-or-later
diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec
index a05dee36b4..c4f876ae8c 100644
--- a/anda/system/xone/dkms/dkms-xone.spec
+++ b/anda/system/xone/dkms/dkms-xone.spec
@@ -7,7 +7,7 @@
 %global dkms_name xone
 
 Name:       dkms-%{dkms_name}
-Version:    %{ver}%{!?tag:^%{date}git%{shortcommit}}
+Version:    %{ver}^%{date}git%{shortcommit}
 Release:    1%{?dist}
 Summary:    Linux kernel driver for Xbox One and Xbox Series X|S accessories
 License:    GPL-2.0-or-later
diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai
index 5059508641..72dee90d6d 100644
--- a/anda/system/xone/dkms/update.rhai
+++ b/anda/system/xone/dkms/update.rhai
@@ -1,8 +1,3 @@
-rpm.global("commit", gh_commit("dlundqvist/xone"));
-if rpm.changed() {
-    rpm.release();
-    rpm.global("date", date());
-    let ver = gh_tag("dlundqvist/xone");
-    ver.crop(1);
-    rpm.global("ver", ver);
-}
+import "andax/bump_extras.rhai" as bump;
+
+rpm.version(bump::madoguchi("xone-kmod-common", labels.branch));
diff --git a/anda/system/xone/update.rhai b/anda/system/xone/xone-kmod-common/update.rhai
similarity index 100%
rename from anda/system/xone/update.rhai
rename to anda/system/xone/xone-kmod-common/update.rhai
diff --git a/anda/system/xone/xone-kmod-common/xone-kmod-common.spec b/anda/system/xone/xone-kmod-common/xone-kmod-common.spec
index 55bd30fa68..8218fea844 100644
--- a/anda/system/xone/xone-kmod-common/xone-kmod-common.spec
+++ b/anda/system/xone/xone-kmod-common/xone-kmod-common.spec
@@ -5,7 +5,7 @@
 %global real_name xone
 
 Name:           %{real_name}-kmod-common
-Version:        %{ver}%{!?tag:^%{date}git%{shortcommit}}
+Version:        %{ver}^%{date}git%{shortcommit}
 Release:        1%{?dist}
 Summary:        Linux kernel driver for Xbox One and Xbox Series X|S accessories common files
 License:        GPL-2.0-or-later