diff --git a/.github/build/deb-mod.sh b/.github/build/deb-mod.sh
index 7ac0224ef..308fdb51c 100644
--- a/.github/build/deb-mod.sh
+++ b/.github/build/deb-mod.sh
@@ -121,7 +121,7 @@ build_module() {
     cmd="find $root_module/tmp -name webmin-${module}*$verorig*\.deb -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
     if [ "$devel" -eq 1 ]; then
-        cmd="mv -f $root_repos/*${module}*$verorig*\.deb $root_repos/${module}_${ver}-1_all.deb $verbosity_level"
+        cmd="mv -f $root_repos/*${module}*$verorig*\.deb $root_repos/${module}_${ver}-${rel}_all.deb $verbosity_level"
         eval "$cmd"
     fi
     postcmd $?
diff --git a/.github/build/deb.sh b/.github/build/deb.sh
index 4a9ace780..5c5ac68b4 100755
--- a/.github/build/deb.sh
+++ b/.github/build/deb.sh
@@ -52,6 +52,7 @@ build_prod() {
     # Define root
     local ver=""
     local prod=$1
+    local devel=0
     root_prod="$root/$prod"
     root_apt="$root_prod/deb"
 
@@ -114,6 +115,7 @@ build_prod() {
         ver=$(get_current_repo_tag)
     fi
     if [[ "'$*'" == *"--testing"* ]]; then
+        devel=1
         ver="$ver.$date_version"
         # Set actual product version
         echo "${ver}" >"version"
@@ -146,9 +148,7 @@ build_prod() {
     purge_dir "$root_prod/minimal"
     purge_dir "$root_prod/tarballs"
     if [ "$prod" != "" ]; then
-        # XXXX Need to check for
-        # product name exactly
-        rm -f "$root_repos/$prod-latest"*
+        rm -f "$root_repos/$prod-"*
     fi
     postcmd $?
     echo
@@ -192,11 +192,11 @@ build_prod() {
 
     cd "$root" || exit 1
     echo "Preparing built files for upload .."
-    cmd="cp -f $root_prod/tarballs/${prod}-${ver}*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
+    cmd="cp -f $root_prod/tarballs/${prod}-${ver}*\.tar.gz $root_repos/${prod}-$$ver.tar.gz $verbosity_level"
     eval "$cmd"
     cmd="find $root_apt -name ${prod}_${ver}${relval}*\.deb -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
-    cmd="mv -f $root_repos/${prod}_${ver}${relval}*\.deb $root_repos/${prod}-latest.deb $verbosity_level"
+    cmd="mv -f $root_repos/${prod}_${ver}${relval}*\.deb $root_repos/${prod}_${ver}-${rel}_all.deb $verbosity_level"
     eval "$cmd"
     postcmd $?
 }
diff --git a/.github/build/rpm-mod.sh b/.github/build/rpm-mod.sh
index 484031613..e97b74148 100644
--- a/.github/build/rpm-mod.sh
+++ b/.github/build/rpm-mod.sh
@@ -133,7 +133,7 @@ build_module() {
     cmd="find $root_rpms -name wbm-$module*$verorig*\.rpm -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
     if [ "$devel" -eq 1 ]; then
-        cmd="mv -f $root_repos/wbm-$module*$verorig*\.rpm $root_repos/${module}-$ver-1.noarch.rpm $verbosity_level"
+        cmd="mv -f $root_repos/wbm-$module*$verorig*\.rpm $root_repos/${module}-$ver-$rel.noarch.rpm $verbosity_level"
         eval "$cmd"
     fi
     postcmd $?
diff --git a/.github/build/rpm.sh b/.github/build/rpm.sh
index f4fe5d9f3..3f9ac014a 100755
--- a/.github/build/rpm.sh
+++ b/.github/build/rpm.sh
@@ -52,6 +52,7 @@ build_prod() {
     # Define root
     local ver=""
     local prod=$1
+    local devel=0
     root_prod="$root/$prod"
 
     # Print build actual date
@@ -111,6 +112,7 @@ build_prod() {
         ver=$(get_current_repo_tag)
     fi
     if [[ "'$*'" == *"--testing"* ]]; then
+        devel=1
         ver="$ver.$date_version"
         # Set actual product version
         echo "${ver}" >"version"
@@ -156,9 +158,7 @@ build_prod() {
     purge_dir "$root_build/SRPMS"
     remove_dir "$root_repos/repodata"
     if [ "$prod" != "" ]; then
-        # XXXX Need to check for
-        # product name exactly
-        rm -f "$root_repos/$prod-latest"*
+        rm -f "$root_repos/$prod-"*
     fi
     postcmd $?
     make_dir "$root_build/RPMS/noarch"
@@ -204,11 +204,11 @@ build_prod() {
 
     cd "$root" || exit 1
     echo "Preparing built files for upload .."
-    cmd="cp -f $root_prod/tarballs/$prod-$ver*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
+    cmd="cp -f $root_prod/tarballs/$prod-$ver*\.tar.gz $root_repos/${prod}-$$ver.tar.gz $verbosity_level"
     eval "$cmd"
     cmd="find $root_rpms -name $prod-$ver-$rel*\.rpm -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
-    cmd="mv -f $root_repos/$prod-$ver-$rel*\.rpm $root_repos/${prod}-latest.rpm $verbosity_level"
+    cmd="mv -f $root_repos/$prod-$ver-$rel*\.rpm $root_repos/${prod}-$ver-$rel.noarch.rpm $verbosity_level"
     eval "$cmd"
     postcmd $?
     echo