diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 5010ea7b226a6ffd6d2f556bd2c76ade153f964f..2629b56b968c0cd11ec8c5ce597474d29f0d32b5 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -724,6 +724,6 @@ JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
 
 # Include Dragonwell version information
 -include @TOPDIR@/dragonwell_version
-DISTRO_NAME=Dragonwell
+DISTRO_NAME=Alibaba Dragonwell
 COMPANY_NAME=Alibaba
 DISTRO_VERSION=$(DRAGONWELL_VERSION)
diff --git a/dragonwell_version b/dragonwell_version
index 497da5a188b7136aa8722be041a229d7c9ab36dc..589c140c5c15c8d7ddbfe8377b29bd3a975c1ece 100644
--- a/dragonwell_version
+++ b/dragonwell_version
@@ -19,5 +19,6 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-DRAGONWELL_VERSION=8.0-preview
+DRAGONWELL_VERSION=8.0.0
 DRAGONWELL_JDK_UPDATE_VERSION=202
+DRAGONWELL_JDK_BUILD_NUMBER=b01
diff --git a/make.sh b/make.sh
index fbf616a1d9ef04d48eba230cea0cafc1a2eb7273..e9d6f9992e76867a9ef9f108d7ebe2d385508348 100755
--- a/make.sh
+++ b/make.sh
@@ -27,7 +27,6 @@ if [ ! -f "dragonwell_version" ]; then
 fi
 source dragonwell_version
 
-DISTRO_VERSION=$DRAGONWELL_VERSION
 
 if [ $# -lt 1 ]; then
   echo "USAGE: $0 release/debug"
@@ -62,10 +61,12 @@ else
   BUILD_INDEX=b$BUILD_NUMBER
 fi
 
+DISTRO_VERSION=${DRAGONWELL_VERSION}-${BUILD_INDEX}
+
 shift
 
 bash ./configure --with-milestone=fcs \
-                 --with-build-number=$BUILD_INDEX \
+                 --with-build-number=${DRAGONWELL_JDK_BUILD_NUMBER} \
                  --with-user-release-suffix="" \
                  --enable-unlimited-crypto \
                  --with-cacerts-file=`pwd`/common/security/cacerts \
@@ -73,7 +74,10 @@ bash ./configure --with-milestone=fcs \
                  --with-debug-level=$DEBUG_LEVEL \
                  --with-zlib=system $*
 make clean
-make LOG=debug images
+
+# The default DISTRO_VERSION in spec.gmk.in does not contain the customer defined build number.
+# Hack DISTRO_VERSION to introduce the number.
+make LOG=debug DISTRO_VERSION=${DISTRO_VERSION} images
 
 # Sanity tests
 JAVA_EXES=("$NEW_JAVA_HOME/bin/java" "$NEW_JAVA_HOME/jre/bin/java" "$NEW_JRE_HOME/bin/java")
@@ -117,9 +121,9 @@ done
 
 # check version string
 $NEW_JAVA_HOME/bin/java -version > /tmp/version.out 2>&1
-grep "^OpenJDK Runtime" /tmp/version.out | grep "(Dragonwell $DISTRO_VERSION)"
+grep "^OpenJDK Runtime" /tmp/version.out | grep "(Alibaba Dragonwell $DISTRO_VERSION)"
 if [ 0 != $? ]; then RET=1; fi
-grep "^OpenJDK .*VM" /tmp/version.out | grep "(Dragonwell $DISTRO_VERSION)"
+grep "^OpenJDK .*VM" /tmp/version.out | grep "(Alibaba Dragonwell $DISTRO_VERSION)"
 if [ 0 != $? ]; then RET=1; fi
 \rm -f /tmp/version.out