diff --git a/git-cvs2git.sh b/git-cvs2git.sh
index 39c6fda..c88c8e6 100755
--- a/git-cvs2git.sh
+++ b/git-cvs2git.sh
@@ -753,10 +753,14 @@ git remote add origin "$GITEAHOST/$ORGGITEA/$1.git"
 git push --force -u $QUIET origin master
 
 # Now create the version and release tag for these files
-RELEASE=`rpm --queryformat '%{release}\n' --specfile $NAME.spec | head -n 1`
+VERSION_RELEASE_LONG=`rpm --queryformat '%{version} %{release}\n' --specfile $NAME.spec`
+VERSION_RELEASE=${VERSION_RELEASE_LONG%%$'\n'*}
+VERSION=${VERSION_RELEASE% *}
+VERSION=${VERSION//./_}
+RELEASE=${VERSION_RELEASE#* }
 # Release is not reliable - if you run on Rocky it comes back EL8, centos 7  - EL7
 # So, we need to just take the build part (first word)
-TAG=$VERSION"-"${RELEASE%.*}
+TAG=$VERSION"-"${RELEASE%.*}"_el8_sme"
 git tag -a $TAG -m "$COMMENT"
 git push origin $TAG $QUIET
 
diff --git a/git-retag.sh b/git-retag.sh
index b7079f7..14c775e 100755
--- a/git-retag.sh
+++ b/git-retag.sh
@@ -160,7 +160,7 @@ VERSION_RELEASE=${VERSION_RELEASE_LONG%%$'\n'*}
 VERSION=${VERSION_RELEASE% *}
 VERSION=${VERSION//./_}
 RELEASE=${VERSION_RELEASE#* }
-TAG=$VERSION"-"${RELEASE%.*}
+TAG=$VERSION"-"${RELEASE%.*}"_el8_sme"
 if [ $DEBUG ] ; then
 	echo "VERSION_RELEASE=$VERSION_RELEASE"
 	echo "VERSION=$VERSION"