diff --git a/build.sh b/build.sh
index a6e2c22..4f1cf67 100755
--- a/build.sh
+++ b/build.sh
@@ -117,10 +117,10 @@ if [[ ${RpmArch} =~ "x86_64" ]];then
 elif [[ ${RpmArch} =~ "aarch64" ]];then
     RelArch=arm64
 fi
-ReleasePkgDir=${ReleaseDir}/"${pkgtype}"s/${RelArch}
 
 case "${pkgtype}" in
     rpm)
+        ReleasePkgDir=${ReleaseDir}/rpms/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
         for procName in $ProcList;do
@@ -180,6 +180,7 @@ case "${pkgtype}" in
         md5sum $RpmPkgRename >omc-md5sum.txt
     ;;
     deb)
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
         for procName in $ProcList;do
@@ -249,6 +250,7 @@ case "${pkgtype}" in
         md5sum ${DebPkgName} >omc-md5sum.txt        
     ;;
     badeb)
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
         for procName in $ProcList;do
@@ -260,7 +262,7 @@ case "${pkgtype}" in
         VersionID=`grep VERSION_ID /etc/os-release`
         if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
             DebBuildDir=${DebBuild2204Dir}
-            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}
             DebFEBuildDir=${DebFEBuild2204Dir}
             #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
             DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-ba.deb
diff --git a/makepkg.sh b/makepkg.sh
index 23a803a..0e62910 100755
--- a/makepkg.sh
+++ b/makepkg.sh
@@ -19,7 +19,7 @@ new_args=()
 be_args=()
 # Traverse all parameters
 for arg in "$@"; do
-    if [[ "$arg" == "deb" || "$arg" == "badeb" || "$arg" == "rpm" ]]; then
+    if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
         pkgtype=$arg
         be_args+=("$arg")
     else
@@ -49,6 +49,10 @@ while getopts "m:r:d" option; do
         d)
             be_args+=("-d")
         ;;
+        c)
+            pkgtype="badeb"
+            be_args+=("$pkgtype")        
+        ;;        
         \?)
             echo "Invalid option: -$OPTARG" >&2
             usage