diff --git a/Makefile b/Makefile
index d009467..e8133b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-CIRCLE_BUILD_NUM ?= 1
+VERSION_BUILD ?= 1
 containerbin:
 	go get github.com/gucumber/gucumber/cmd/gucumber
 	export PKG_CONFIG_PATH=$GOPATH/src/github.com/xtracdev/es-atom-replicator/pkgconfig/
 	go test
 	gucumber
-	GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$CIRCLE_BUILD_NUM" -a -installsuffix cgo -o replicator ./cmd/
+	GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$(VERSION_BUILD)" -a -installsuffix cgo -o replicator ./cmd/
 	cp replicator /artifacts
diff --git a/circle.yml b/circle.yml
index 38b76a7..16187f3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 
 dependencies:
   override:
-    - docker run --rm -v "$PWD":/go/src/github.com/xtracdev/es-atom-replicator -v "$CIRCLE_ARTIFACTS":/artifacts -e DB_USER=$DB_USER -e DB_PASSWORD=$DB_PASSWORD -e DB_HOST=$DB_HOST -e DB_PORT=$DB_PORT -e DB_SVC=$DB_SVC -w /go/src/github.com/xtracdev/es-atom-replicator xtracdev/goora bash -c make
+    - docker run --rm -v "$PWD":/go/src/github.com/xtracdev/es-atom-replicator -v "$CIRCLE_ARTIFACTS":/artifacts -e VERSION_BUILD=$CIRCLE_BUILD_NUM -e DB_USER=$DB_USER -e DB_PASSWORD=$DB_PASSWORD -e DB_HOST=$DB_HOST -e DB_PORT=$DB_PORT -e DB_SVC=$DB_SVC -w /go/src/github.com/xtracdev/es-atom-replicator xtracdev/goora bash -c make
 
 test:
   override: