diff --git a/build-ubunturepo b/build-ubunturepo
index 7511a168d..97ce0a1c1 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -183,8 +183,8 @@ then
         short_short_ver=`cat Version|cut -d. -f 1`
         build_time=`date`
         build_machine=`hostname`
-        commit_id=`git rev-parse --short HEAD`
         commit_id_long=`git rev-parse HEAD`
+        commit_id="${commit_id_long:0:7}"
 
         package_dir_name=debs$REL
         #TODO: define the core path and tarball name
diff --git a/buildcore.sh b/buildcore.sh
index 1b41b4b1c..7ed9e277e 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -188,8 +188,8 @@ function setversionvars {
     SHORTSHORTVER=`echo $VER|cut -d. -f 1`
     BUILD_TIME=`date`
     BUILD_MACHINE=`hostname`
-    COMMIT_ID=`git rev-parse --short HEAD`
     COMMIT_ID_LONG=`git rev-parse HEAD`
+    COMMIT_ID="${COMMIT_ID_LONG:0:7}"
     XCAT_RELEASE="snap$(date '+%Y%m%d%H%M')"
     echo "$XCAT_RELEASE" >Release
 }