diff --git a/systemd.spec b/systemd.spec
index 75720d8..10ad145 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -661,9 +661,9 @@ CONFIGURE_OPTS=(
         -Dsplit-bin=true
         -Db_ndebug=false
         -Dman=enabled
-        -Dversion-tag=%{version}-%{release}
+        -Dversion-tag=%{version}%[%{without upstream}?"-%{release}":""]
         # https://bugzilla.redhat.com/show_bug.cgi?id=1906010
-        -Dshared-lib-tag=%{version_no_tilde}-%{release}
+        -Dshared-lib-tag=%{version_no_tilde}%[%{without upstream}?"-%{release}":""]
         -Dfallback-hostname="localhost"
         -Ddefault-dnssec=no
         -Ddefault-dns-over-tls=no