diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 553b6f22d5..3966cf4b00 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -85,7 +85,7 @@ steps:
     key: go-build
     plugins:
       - n0izn0iz/docker#v3.5.4:
-          image: bertytech/bazel:2.0.0-buster-r0
+          image: bertytech/build-go:v2
           propagate-uid-gid: true
           workdir: /go/src/berty.tech
           environment:
@@ -94,6 +94,7 @@ steps:
               "GOPATH=/home/buildkite-agent/go",
               "HOME=/home/buildkite-agent",
               "GOSUMDB=off",
+              "CODECOV_TOKEN",
             ]
           volumes: ["~:/home/buildkite-agent"]
     commands:
@@ -119,7 +120,7 @@ steps:
       - rm -f /tmp/golangci-lint.lock
       - make lint
       - cd ..
-      - codecov -f ./go/coverage.txt
+      - codecov -t "$CODECOV_TOKEN" -f ./go/coverage.txt
 
   - label: bazel-go
     plugins:
diff --git a/go/go.mod b/go/go.mod
index 7aa6c95617..518ee04a16 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -34,5 +34,3 @@ require (
 replace github.com/golangci/golangci-lint => github.com/golangci/golangci-lint v1.18.0
 
 replace github.com/go-critic/go-critic v0.0.0-20181204210945-ee9bf5809ead => github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540
-
-replace github.com/libp2p/go-openssl v0.0.4 => github.com/berty/go-openssl v0.0.4-0.20191218181502-e16977b4b693
diff --git a/go/go.sum b/go/go.sum
index 1d9ec3e496..83f29bec57 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -32,8 +32,6 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/berty/go-openssl v0.0.4-0.20191218181502-e16977b4b693 h1:enqLl4URQdhMj4EIRLlWPuBIeDS6WPUqy0d72EZCcng=
-github.com/berty/go-openssl v0.0.4-0.20191218181502-e16977b4b693/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d h1:QgeLLoPD3kRVmeu/1al9iIpIANMi9O1zXFm8BnYGCJg=
 github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d/go.mod h1:Jbj8eKecMNwf0KFI75skSUZqMB4UCRcndUScVBTWyUI=
@@ -529,6 +527,8 @@ github.com/libp2p/go-nat v0.0.4 h1:KbizNnq8YIf7+Hn7+VFL/xE0eDrkPru2zIO9NMwL8UQ=
 github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
 github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
 github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
+github.com/libp2p/go-openssl v0.0.4 h1:d27YZvLoTyMhIN4njrkr8zMDOM4lfpHIp6A+TK9fovg=
+github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FWpFLw=
 github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
 github.com/libp2p/go-reuseport-transport v0.0.1/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
diff --git a/tool/docker-build-go/Dockerfile b/tool/docker-build-go/Dockerfile
new file mode 100644
index 0000000000..dd667cd947
--- /dev/null
+++ b/tool/docker-build-go/Dockerfile
@@ -0,0 +1,5 @@
+FROM golang:1.13.5-buster
+
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.21.0
+
+RUN curl -s https://codecov.io/bash > /bin/codecov && chmod +x /bin/codecov
diff --git a/tool/docker-build-go/Makefile b/tool/docker-build-go/Makefile
new file mode 100644
index 0000000000..005834f3db
--- /dev/null
+++ b/tool/docker-build-go/Makefile
@@ -0,0 +1,10 @@
+IMAGE ?=	bertytech/build-go
+VERSION ?=  v2
+
+build:
+	docker build -t $(IMAGE):$(VERSION) .
+
+publish: build
+	docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	docker push $(IMAGE):$(VERSION)
+	docker push $(IMAGE):latest