diff --git a/.promu.yml b/.promu.yml
index 72d7943b89..6e371cc179 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -7,7 +7,7 @@ build:
           path: ./cmd/prometheus
         - name: promtool
           path: ./cmd/promtool
-    flags: -tags netgo
+    flags: -a -tags netgo
     ldflags: |
         -X {{repoPath}}/version.Version={{.Version}}
         -X {{repoPath}}/version.Revision={{.Revision}}
@@ -21,25 +21,3 @@ tarball:
         - documentation/examples/prometheus.yml
         - LICENSE
         - NOTICE
-crossbuild:
-    platforms:
-        - linux/amd64
-        - linux/386
-        - darwin/amd64
-        - darwin/386
-        - windows/amd64
-        - windows/386
-        - freebsd/amd64
-        - freebsd/386
-        - openbsd/amd64
-        - openbsd/386
-        - netbsd/amd64
-        - netbsd/386
-        - dragonfly/amd64
-        - linux/arm
-        - linux/arm64
-        - freebsd/arm
-        - openbsd/arm
-        - netbsd/arm
-        - linux/ppc64
-        - linux/ppc64le
diff --git a/circle.yml b/circle.yml
index 18406202d2..7c5b90db81 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/prometheus
     QUAY_IMAGE_NAME: quay.io/prometheus/prometheus
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.5.4-main
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6.2-main
     REPO_PATH: github.com/prometheus/prometheus
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
@@ -13,7 +13,7 @@ machine:
 
 dependencies:
   pre:
-    - go get -u github.com/prometheus/promu
+    - make promu
     - docker info
   override:
     - promu crossbuild