diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1fd1da046..2fc5616ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -194,6 +194,7 @@ jobs:
           name: Running build
           command: |
             . ./.circleci/scripts/version.sh
+            . ./.circleci/scripts/credentials.sh
             make build-circle
       - run:
           name: Persist version file
diff --git a/.circleci/scripts/credentials.sh b/.circleci/scripts/credentials.sh
index 2fe50eeb7..b6458a288 100755
--- a/.circleci/scripts/credentials.sh
+++ b/.circleci/scripts/credentials.sh
@@ -3,18 +3,26 @@
 if expr "$CIRCLE_BRANCH" : 'qa' >/dev/null; then
   export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_QA"
   export AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_QA"
+  export METRIC_BASIC_USER="$METRIC_BASIC_USER_QA"
+  export METRIC_BASIC_PASS="$METRIC_BASIC_PASS_QA"
 
 elif expr "$CIRCLE_BRANCH" : '^release-.*' >/dev/null; then
   export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_PROD"
   export AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_PROD"
+  export METRIC_BASIC_USER="$METRIC_BASIC_USER_PROD"
+  export METRIC_BASIC_PASS="$METRIC_BASIC_PASS_PROD"
 
 elif expr "$CIRCLE_BRANCH" : '^nightly' >/dev/null; then
   export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_PROD"
   export AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_PROD"
+  export METRIC_BASIC_USER="$METRIC_BASIC_USER_PROD"
+  export METRIC_BASIC_PASS="$METRIC_BASIC_PASS_PROD"
 
 elif expr "$CIRCLE_BRANCH" : '^beta' >/dev/null; then
   export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_PROD"
   export AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_PROD"
+  export METRIC_BASIC_USER="$METRIC_BASIC_USER_PROD"
+  export METRIC_BASIC_PASS="$METRIC_BASIC_PASS_PROD"
 else
   echo ""
 fi
diff --git a/.circleci/scripts/ritchie_metric_server.sh b/.circleci/scripts/ritchie_metric_server.sh
index 6efc7fa72..be5c939a9 100755
--- a/.circleci/scripts/ritchie_metric_server.sh
+++ b/.circleci/scripts/ritchie_metric_server.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if expr "$VERSION" : '.*qa.*' >/dev/null; then
-  echo "https://ritchie-metrics.itiaws.dev/metrics"
+  echo "https://ritchie-metrics.devdennis.zup.io/v2/metrics"
 elif expr "$VERSION" : '^[0-9]\+' >/dev/null; then
-  echo "https://ritchie-metrics.zup.io/metrics"
+  echo "https://ritchie-metrics.zup.io/v2/metrics"
 else
   echo ""
 fi
diff --git a/Makefile b/Makefile
index 9aa29ec46..cf61db6a5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,18 +25,19 @@ IS_NIGHTLY=$(shell echo $(VERSION) | egrep "*.nightly.*")
 GONNA_RELEASE=$(shell ./.circleci/scripts/gonna_release.sh)
 NEXT_VERSION=$(shell ./.circleci/scripts/next_version.sh)
 METRIC_SERVER_URL=$(shell VERSION=$(VERSION) ./.circleci/scripts/ritchie_metric_server.sh)
+BUILD_ENVS='-X $(MODULE)/pkg/metric.BasicUser=$(METRIC_BASIC_USER) -X $(MODULE)/pkg/metric.BasicPass=$(METRIC_BASIC_PASS) -X $(MODULE)/pkg/metric.ServerRestURL=$(METRIC_SERVER_URL) -X $(MODULE)/pkg/cmd.Version=$(VERSION) -X $(MODULE)/pkg/cmd.BuildDate=$(DATE)'
 
 build-linux:
 	mkdir -p $(DIST_LINUX)
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO_BUILD) -ldflags '-X $(MODULE)/pkg/metric.ServerRestURL=$(METRIC_SERVER_URL) -X $(MODULE)/pkg/cmd.Version=$(VERSION) -X $(MODULE)/pkg/cmd.BuildDate=$(DATE)' -o ./$(DIST_LINUX)/$(BINARY_NAME) -v $(CMD_PATH)
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO_BUILD) -ldflags $(BUILD_ENVS) -o ./$(DIST_LINUX)/$(BINARY_NAME) -v $(CMD_PATH)
 
 build-mac:
 	mkdir -p $(DIST_MAC)
-	GOOS=darwin GOARCH=amd64 $(GO_BUILD) -ldflags '-X $(MODULE)/pkg/metric.ServerRestURL=$(METRIC_SERVER_URL) -X $(MODULE)/pkg/cmd.Version=$(VERSION) -X $(MODULE)/pkg/cmd.BuildDate=$(DATE)' -o ./$(DIST_MAC)/$(BINARY_NAME) -v $(CMD_PATH)
+	GOOS=darwin GOARCH=amd64 $(GO_BUILD) -ldflags $(BUILD_ENVS) -o ./$(DIST_MAC)/$(BINARY_NAME) -v $(CMD_PATH)
 
 build-windows:
 	mkdir -p $(DIST_WIN)
-	GOOS=windows GOARCH=amd64 $(GO_BUILD) -ldflags '-X $(MODULE)/pkg/metric.ServerRestURL=$(METRIC_SERVER_URL) -X $(MODULE)/pkg/cmd.Version=$(VERSION) -X $(MODULE)/pkg/cmd.BuildDate=$(DATE)' -o ./$(DIST_WIN)/$(BINARY_NAME).exe -v $(CMD_PATH)
+	GOOS=windows GOARCH=amd64 $(GO_BUILD) -ldflags $(BUILD_ENVS) -o ./$(DIST_WIN)/$(BINARY_NAME).exe -v $(CMD_PATH)
 
 build: build-linux build-mac build-windows
 ifneq "$(BUCKET)" ""
diff --git a/pkg/metric/http_sender.go b/pkg/metric/http_sender.go
index 1180d040d..b2386134b 100644
--- a/pkg/metric/http_sender.go
+++ b/pkg/metric/http_sender.go
@@ -24,6 +24,11 @@ import (
 
 var _ Sender = SendManagerHttp{}
 
+var (
+	BasicUser = ""
+	BasicPass = ""
+)
+
 type SendManagerHttp struct {
 	URL    string
 	client *http.Client
@@ -47,6 +52,7 @@ func (sm SendManagerHttp) Send(APIData APIData) {
 		return
 	}
 
+	req.SetBasicAuth(BasicUser, BasicPass)
 	req.Header.Add("Content-Type", "application/json")
 	_, _ = sm.client.Do(req)
 }