diff --git a/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec b/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec
index 18d665fa2a..33e9ce8e5b 100644
--- a/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec
+++ b/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec
@@ -7,7 +7,7 @@
 %global plug_rdnn io.elementary.switchboard.wallet
 
 %global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
-%global commit_date 240218
+%global commit_date 20240218
 
 Name:           switchboard-plug-wallet
 Summary:        Switchboard Wallet Plug
diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec
index 362f8608a1..6d04099f3c 100644
--- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec
+++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec
@@ -3,11 +3,11 @@
 %global uuid        %{extension}@system76.com
 %global commit      9a30c5bd49c373896410852d6477596ac4c43bd3
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 240218
+%global commit_date 20240218
 %global ver         1.2.0
 
 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%{shortcommit}
+Version:        %{ver}^%commit_date.%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only
diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec
index 3596813834..1db74e2b0f 100644
--- a/anda/langs/nim/nim-nightly/nim-nightly.spec
+++ b/anda/langs/nim/nim-nightly/nim-nightly.spec
@@ -1,11 +1,12 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
 %global commit 78c834dd76f273d8813247647531005a1f7db1a6
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
 %global commit_date 20240312
 %global debug_package %nil
 
 Name:			nim-nighlty
-Version:		%ver^%commit_date.%commit
+Version:		%ver^%commit_date.%shortcommit
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
diff --git a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec
index f7b354feb6..0b06544d2f 100644
--- a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec
+++ b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec
@@ -3,7 +3,7 @@
 %global commit 3b5fe941bea6ecd5c8fcb84930c40b8582eea165
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-%global commit_date 240218
+%global commit_date 20240218
 %global snapshot_info %{commit_date}.%{shortcommit}
 %global verrel 0.48.7
 
diff --git a/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec b/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec
index 62c942888a..74db6063ff 100644
--- a/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec
+++ b/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec
@@ -3,7 +3,7 @@
 %global commit 8ae2bb65fe66458263d94711ae4ddd978faece00
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-%global commit_date 240218
+%global commit_date 20240218
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 Name:			vala-lint-nightly
diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec
index 06798e44c3..6b0172d65c 100644
--- a/anda/langs/vala/vala-nightly/vala-nightly.spec
+++ b/anda/langs/vala/vala-nightly/vala-nightly.spec
@@ -7,7 +7,7 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git
 
-%global commit_date 240218
+%global commit_date 20240218
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 Name:           vala-nightly
diff --git a/anda/lib/pqmarble/anda.hcl b/anda/lib/pqmarble/anda.hcl
index 9c60fdd668..62e5e5282b 100644
--- a/anda/lib/pqmarble/anda.hcl
+++ b/anda/lib/pqmarble/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
 	rpm {
 		spec = "pqmarble.spec"
 	}
+	labels {
+		nightly = "1"
+	}
 }
diff --git a/anda/lib/pqmarble/pqmarble.spec b/anda/lib/pqmarble/pqmarble.spec
index eb487fb3c0..5b2ba97968 100644
--- a/anda/lib/pqmarble/pqmarble.spec
+++ b/anda/lib/pqmarble/pqmarble.spec
@@ -1,8 +1,10 @@
 %global commit f240b2ec7d5cdacb8fdcc553703420dc5101ffdb
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240310
 %global ver 2.0.0
 
 Name:			pqmarble
-Version:		%ver^%commit
+Version:		%ver^%commit_date.%shortcommit
 Release:		1%{?dist}
 Summary:		My GTK library
 License:		GPL-3.0
diff --git a/anda/lib/pqmarble/update.rhai b/anda/lib/pqmarble/update.rhai
index 7e4fd7d2f3..82f1add4a1 100644
--- a/anda/lib/pqmarble/update.rhai
+++ b/anda/lib/pqmarble/update.rhai
@@ -1,4 +1,8 @@
-let req = get("https://gitlab.gnome.org/api/v4/projects/20662/repository/branches/master").json();
-rpm.global("commit", req.commit.id);
-let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build");
-rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1));
+if filters.contains("nightly") {
+	rpm.global("commit", gitlab_commit("gitlab.gnome.org", "20662", "master"));
+	if rpm.changed() {
+		let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build");
+		rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1));
+		rpm.global("commit_date", date());
+	}
+}
diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec
index 893b777dd2..4679e9071d 100644
--- a/anda/lib/tdlib/tdlib-nightly.spec
+++ b/anda/lib/tdlib/tdlib-nightly.spec
@@ -1,8 +1,10 @@
 %global commit d0ff90bb19a235d9357f0874b0a62306e40d90b8
 %global ver 1.8.25
-%global commit_date 240219
+%global commit_date 20240219
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name: tdlib-nightly
-Version: %ver^%commit_date.%commit
+Version: %ver^%commit_date.%shortcommit
 Release: 1%?dist
 License: BSL-1.0
 URL: https://github.com/tdlib/td
diff --git a/anda/lib/tdlib/update.rhai b/anda/lib/tdlib/update.rhai
index 005873e8d5..0e2cafa333 100644
--- a/anda/lib/tdlib/update.rhai
+++ b/anda/lib/tdlib/update.rhai
@@ -1,7 +1,7 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("tdlib/td"));
 	if rpm.changed() {
-		let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", gh_rawfile("tdlib/td", "master", "CMakeLists.txt")), 1);
+		let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", gh_rawfile("tdlib/td", "master", "CMakeLists.txt"), 1);
 		rpm.global("ver", v);
 		rpm.release();
 	}
diff --git a/anda/system/avstplg/avstplg.spec b/anda/system/avstplg/avstplg.spec
index 79e4cbb141..c5bd26eec6 100644
--- a/anda/system/avstplg/avstplg.spec
+++ b/anda/system/avstplg/avstplg.spec
@@ -1,5 +1,5 @@
 %global commit 7cb289b6466b662fdf9f7d7ccc9f3c08a7dc0cac
-%global commit_date 240219
+%global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}
diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec
index 639577ceec..e8f83e7901 100644
--- a/anda/system/nvidia-patch/nvidia-patch.spec
+++ b/anda/system/nvidia-patch/nvidia-patch.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 %global commit 564c0661a942f7163cb2cfa6cb1b14b4bcff3a30
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 240218
+%global commit_date 20240218
 
 
 %global patches %{_datadir}/src/nvidia-patch