diff --git a/.github/workflows/hub-ci.yml b/.github/workflows/hub-ci.yml
index c7e549736..ef43afbcb 100644
--- a/.github/workflows/hub-ci.yml
+++ b/.github/workflows/hub-ci.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: Build release
-      run: make release
+      run: BUILD_VERSION=xxx make release
     - name: clone and build hub CI tool
       run: |
         git clone https://github.com/crowdsecurity/hub-tests.git
@@ -27,19 +27,19 @@ jobs:
         make
     - name: Create crowdsec test env with all parsers from the release
       run: |
-        cd crowdsec-pull
+        cd crowdsec-xxx
         ./test_env.sh
         cd tests
         for i in `./cscli -c dev.yaml list parsers -a -o json | jq -r ".[].name" ` ; do 
           ./cscli -c dev.yaml install parser $i ; 
         done
     - name: Setup hub ci in crowdsec
-      working-directory: ./crowdsec-pull/tests/
+      working-directory: ./crowdsec-xxx/tests/
       run: |
         cp -R ../../hub-tests/tests .
         cp ../../hub-tests/main .
     - name: Run the HUB CI
-      working-directory: ./crowdsec-pull/tests/
+      working-directory: ./crowdsec-xxx/tests/
       run: |
         for i in `find ./tests -mindepth 1 -maxdepth 1 -type d` ; do 
           echo "::group::Test-${i}" ; 
diff --git a/Makefile b/Makefile
index ec6c6a4aa..68ddca9d3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,11 @@ REQUIRE_GOVERSION="1.13"
 
 
 #Current versioning information from env
-export BUILD_VERSION="$(shell git for-each-ref --sort=-v:refname --count=1 --format '%(refname)'  | cut -d '/' -f3)"
-export BUILD_GOVERSION="$(shell go version | cut -d " " -f3 | sed -r 's/[go]+//g')"
-export BUILD_CODENAME=$(shell cat RELEASE.json | jq -r .CodeName)
-export BUILD_TIMESTAMP=$(shell date +%F"_"%T)
-export BUILD_TAG="$(shell git rev-parse HEAD)"
+BUILD_VERSION?="$(shell git for-each-ref --sort=-v:refname --count=1 --format '%(refname)'  | cut -d '/' -f3)"
+BUILD_GOVERSION="$(shell go version | cut -d " " -f3 | sed -r 's/[go]+//g')"
+BUILD_CODENAME=$(shell cat RELEASE.json | jq -r .CodeName)
+BUILD_TIMESTAMP=$(shell date +%F"_"%T)
+BUILD_TAG="$(shell git rev-parse HEAD)"
 export LD_OPTS=-ldflags "-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Version=$(BUILD_VERSION) \
 -X github.com/crowdsecurity/crowdsec/pkg/cwversion.BuildDate=$(BUILD_TIMESTAMP) \
 -X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=$(BUILD_CODENAME)  \