diff --git a/anda/system/pi-topd/pi-topd.spec b/anda/system/pi-topd/pi-topd.spec
index 8e89355cbe..d6d9b494fe 100644
--- a/anda/system/pi-topd/pi-topd.spec
+++ b/anda/system/pi-topd/pi-topd.spec
@@ -1,7 +1,6 @@
 %global pypi_name pi-topd
-%global ver v5.7.0-1
-%global sanitized_ver %(echo %{ver} | sed 's/-//g')
-%global setup_ver %(echo %{ver} | sed 's/^v//')
+%global ver 5.7.0-1
+%global sanitized_ver %(echo %{ver} | sed 's/-/^/g')
 
 Name:           python-%{pypi_name}
 Version:        %{sanitized_ver}
@@ -10,7 +9,7 @@ Summary:        Daemon for managing pi-top functionality by managing the pi-top
 
 License:        Apache-2.0
 URL:            https://github.com/pi-top/pi-topd
-Source0:        %{url}/archive/refs/tags/v%{setup_ver}.tar.gz
+Source0:        %{url}/archive/refs/tags/v%{ver}.tar.gz
 Source1:        Apache-2.0.txt
 BuildRequires:  pyproject-rpm-macros
 BuildRequires:  python3-devel
@@ -32,7 +31,7 @@ Summary:        %{summary}
 %description -n python3-%{pypi_name} %_description
 
 %prep
-%autosetup -n %{pypi_name}-%{setup_ver}
+%autosetup -n %{pypi_name}-%{ver}
 
 %pyproject_patch_dependency pyee:drop_constraints
 %pyproject_patch_dependency pyzmq:drop_constraints
diff --git a/anda/system/pi-topd/update.rhai b/anda/system/pi-topd/update.rhai
index c6f6e7a958..439d5bd397 100644
--- a/anda/system/pi-topd/update.rhai
+++ b/anda/system/pi-topd/update.rhai
@@ -1 +1,3 @@
-rpm.global("ver", gh("pi-top/pi-topd"));
+let v = gh("pi-top/pi-topd");
+v.crop(1);
+rpm.global("ver", v);
diff --git a/anda/tools/pi-top-Python-SDK/pi-top-Python-SDK.spec b/anda/tools/pi-top-Python-SDK/pi-top-Python-SDK.spec
index fa78f7a347..29d0d8ce1c 100644
--- a/anda/tools/pi-top-Python-SDK/pi-top-Python-SDK.spec
+++ b/anda/tools/pi-top-Python-SDK/pi-top-Python-SDK.spec
@@ -1,7 +1,7 @@
 %global pypi_name pitop
 %global _desc A simple, modular interface for interacting with a pi-top and its related accessories and components.
-%global ver v0.35.0-4
-%global sanitized_ver %(echo %{ver} | sed 's/-//g')
+%global ver 0.35.0-4
+%global sanitized_ver %(echo %{ver} | sed 's/-/^/g')
 
 Name:			python-%{pypi_name}
 Version:		%{sanitized_ver}
diff --git a/anda/tools/pi-top-Python-SDK/update.rhai b/anda/tools/pi-top-Python-SDK/update.rhai
index 8277419700..e62d82634b 100644
--- a/anda/tools/pi-top-Python-SDK/update.rhai
+++ b/anda/tools/pi-top-Python-SDK/update.rhai
@@ -1 +1,3 @@
-rpm.global("ver",gh("pi-top/pi-top-Python-SDK"));
+let v = gh("pi-top/pi-top-Python-SDK");
+v.crop(1);
+rpm.global("ver", v);