diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai
index 95295c3ac6..1e2fcbcc56 100644
--- a/anda/system/xone/akmod/update.rhai
+++ b/anda/system/xone/akmod/update.rhai
@@ -1,4 +1,4 @@
-let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {
diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec
index 90a04d2b8b..710e47fcdf 100644
--- a/anda/system/xone/akmod/xone-kmod.spec
+++ b/anda/system/xone/akmod/xone-kmod.spec
@@ -1,8 +1,4 @@
 %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31
-%global commitdate 20241223
-%global commitdate 20241223
-%global commitdate 20241223
-%global commitdate 20241223
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20241223
 %global ver 0.3
diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec
index 83a29816d9..5ee46c5baa 100644
--- a/anda/system/xone/dkms/dkms-xone.spec
+++ b/anda/system/xone/dkms/dkms-xone.spec
@@ -1,8 +1,4 @@
 %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31
-%global commitdate 20241223
-%global commitdate 20241223
-%global commitdate 20241223
-%global commitdate 20241223
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20241223
 %global ver 0.3
diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai
index 0ac5d9b6bb..1e2fcbcc56 100644
--- a/anda/system/xone/dkms/update.rhai
+++ b/anda/system/xone/dkms/update.rhai
@@ -1,11 +1,11 @@
-let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {
     rpm.release();
-    let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout;
+    let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout;
     d.pop();
-    rpm.global("commit_date", d);
+    rpm.global("commitdate", d);
     let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
     v.pop();
     rpm.global("ver", v);
diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai
index 05ee92a730..26a5eb17b4 100644
--- a/anda/system/xpad-noone/akmod/update.rhai
+++ b/anda/system/xpad-noone/akmod/update.rhai
@@ -1,4 +1,4 @@
-let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {
diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec
index 29018fe6d2..7ae74e4dcd 100644
--- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec
+++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec
@@ -1,8 +1,4 @@
 %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5
-%global commitdate 20240109
-%global commitdate 20240109
-%global commitdate 20240109
-%global commitdate 20240109
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20240109
 %global ver 1.0
diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec
index 171a691593..f7831a347e 100644
--- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec
+++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec
@@ -1,8 +1,4 @@
 %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5
-%global commitdate 20240109
-%global commitdate 20240109
-%global commitdate 20240109
-%global commitdate 20240109
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20240109
 %global ver 1.0
diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai
index 05ee92a730..26a5eb17b4 100644
--- a/anda/system/xpad-noone/dkms/update.rhai
+++ b/anda/system/xpad-noone/dkms/update.rhai
@@ -1,4 +1,4 @@
-let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {
diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai
index 2a64921582..b7de501f56 100644
--- a/anda/system/xpadneo/akmod/update.rhai
+++ b/anda/system/xpadneo/akmod/update.rhai
@@ -1,4 +1,4 @@
-let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {
diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec
index 904b18d74b..ddf279cb16 100644
--- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec
+++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec
@@ -1,8 +1,4 @@
 %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03
-%global commitdate 20241224
-%global commitdate 20241224
-%global commitdate 20241224
-%global commitdate 20241224
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20241224
 %global ver 0.9.7
diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec
index 2160c09ffc..5fe28ad089 100644
--- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec
+++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec
@@ -1,8 +1,4 @@
 %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03
-%global commitdate 20241224
-%global commitdate 20241224
-%global commitdate 20241224
-%global commitdate 20241224
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20241224
 %global ver 0.9.7
diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai
index 2a64921582..b7de501f56 100644
--- a/anda/system/xpadneo/dkms/update.rhai
+++ b/anda/system/xpadneo/dkms/update.rhai
@@ -1,4 +1,4 @@
-let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
 rpm.global("commit", c);
 if rpm.changed() {