diff --git a/build.sh b/build.sh
index 0936d74..711725a 100644
--- a/build.sh
+++ b/build.sh
@@ -68,6 +68,7 @@ RpmArch=`arch`
 RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/
 ReleaseDir=${EmsBuildRoot}/release
 DumpToolDir=${EmsBEDir}/tools/misc
+ProjectTag=multi-tenancy
 
 BuildDir=${EmsBuildRoot}/build
 BuildOMCDir=${BuildDir}/usr/local/omc
@@ -190,8 +191,14 @@ case "${pkgtype}" in
             DebFEBuildDir=${DebFEBuild2204Dir}
             #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
             DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb
+            if [ ! $ProjectTag = "" ]; then
+                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-${ProjectTag}.deb
+            fi
         elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
             DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18.deb
+            if [ ! $ProjectTag = "" ]; then
+                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18-${ProjectTag}.deb
+            fi            
         else 
             echo "Invalid OS release: ${VersionID}"
             exit 1