diff --git a/Makefile.def b/Makefile.def
index 5ef5796fd4..f78fafea09 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -1,9 +1,9 @@
 
 # If tag not explicitly set in users default to the git sha.
-TAG=v0.4
-GitSHA=a531a6944adfe3aaa45b0466f601b338cf0237b2
+TAG=v0.4.0
+GitSHA=`git rev-parse HEAD`
 Date=`date "+%Y-%m-%d %H:%M:%S"`
-RELEASE_VER=v0.4
+RELEASE_VER=v0.4.0
 LD_FLAGS=" \
     -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
     -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
diff --git a/defs/Makefile.release.def b/defs/Makefile.release.def
index 82a3157467..c9dd71ab70 100644
--- a/defs/Makefile.release.def
+++ b/defs/Makefile.release.def
@@ -1,9 +1,9 @@
 
 # If tag not explicitly set in users default to the git sha.
-TAG=v0.4
+TAG=v0.4.0
 GitSHA=__git_sha__
 Date=`date "+%Y-%m-%d %H:%M:%S"`
-RELEASE_VER=v0.4
+RELEASE_VER=v0.4.0
 LD_FLAGS=" \
     -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
     -X '${REPO_PATH}/pkg/version.Built=${Date}'   \