diff --git a/build/build_binary.sh b/build/build_binary.sh
index dc17396f9..ca6a25d53 100755
--- a/build/build_binary.sh
+++ b/build/build_binary.sh
@@ -4,12 +4,14 @@ set -euo pipefail
 mkdir -p dist
 
 # populate tool versions
-BUILDNUMBER="N/A"
-CONTAINER_IMAGE_TAG="N/A"
-NODE_VERSION="0"
-YARN_VERSION="0"
-WEBPACK_VERSION="0"
-GO_VERSION="0"
+
+BUILDNUMBER=${BUILDNUMBER:-"N/A"}
+CONTAINER_IMAGE_TAG=${CONTAINER_IMAGE_TAG:-"N/A"}
+NODE_VERSION=${NODE_VERSION:-$(node -v)}
+YARN_VERSION=${YARN_VERSION:-$(yarn --version))}
+WEBPACK_VERSION=${WEBPACK_VERSION:-$(yarn list webpack --depth=0 | grep webpack | awk -F@ '{print $2}')}
+GO_VERSION=${GO_VERSION:-$(go version | awk '{print $3}')}
+GIT_COMMIT_HASH=${GIT_COMMIT_HASH:-$(git rev-parse --short HEAD)}
 
 # copy templates
 cp -r "./mustache-templates" "./dist"
@@ -21,12 +23,13 @@ go get -t -d -v ./...
 
 
 ldflags="-s -X 'github.com/portainer/liblicense.LicenseServerBaseURL=https://api.portainer.io' \
--X 'github.com/portainer/portainer-ee/api/build.BuildNumber=${BUILDNUMBER}' \
--X 'github.com/portainer/portainer-ee/api/build.ImageTag=${CONTAINER_IMAGE_TAG}' \
--X 'github.com/portainer/portainer-ee/api/build.NodejsVersion=${NODE_VERSION}' \
--X 'github.com/portainer/portainer-ee/api/build.YarnVersion=${YARN_VERSION}' \
--X 'github.com/portainer/portainer-ee/api/build.WebpackVersion=${WEBPACK_VERSION}' \
--X 'github.com/portainer/portainer-ee/api/build.GoVersion=${GO_VERSION}'"
+-X 'github.com/portainer/portainer/api/build.BuildNumber=${BUILDNUMBER}' \
+-X 'github.com/portainer/portainer/api/build.ImageTag=${CONTAINER_IMAGE_TAG}' \
+-X 'github.com/portainer/portainer/api/build.NodejsVersion=${NODE_VERSION}' \
+-X 'github.com/portainer/portainer/api/build.YarnVersion=${YARN_VERSION}' \
+-X 'github.com/portainer/portainer/api/build.WebpackVersion=${WEBPACK_VERSION}' \
+-X 'github.com/portainer/portainer/api/build.GitCommit=${GIT_COMMIT_HASH}' \
+-X 'github.com/portainer/portainer/api/build.GoVersion=${GO_VERSION}'"
 
 BINARY_VERSION_FILE="../binary-version.json"