diff --git a/Makefile b/Makefile
index daa51ffb..504ed3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
 
 include Makefile.common
 
-PROMTOOL_VERSION ?= 2.5.0
+PROMTOOL_VERSION ?= 2.18.1
 PROMTOOL_URL     ?= https://github.com/prometheus/prometheus/releases/download/v$(PROMTOOL_VERSION)/prometheus-$(PROMTOOL_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 PROMTOOL         ?= $(FIRST_GOPATH)/bin/promtool
 
@@ -129,9 +129,5 @@ test-docker:
 promtool: $(PROMTOOL)
 
 $(PROMTOOL):
-	$(eval PROMTOOL_TMP := $(shell mktemp -d))
-	curl -s -L $(PROMTOOL_URL) | tar -xvzf - -C $(PROMTOOL_TMP)
 	mkdir -p $(FIRST_GOPATH)/bin
-	cp $(PROMTOOL_TMP)/prometheus-$(PROMTOOL_VERSION).$(GO_BUILD_PLATFORM)/promtool $(FIRST_GOPATH)/bin/promtool
-	rm -r $(PROMTOOL_TMP)
-
+	curl -fsS -L $(PROMTOOL_URL) | tar -xvzf - -C $(FIRST_GOPATH)/bin --no-anchored --strip 1 promtool
diff --git a/checkmetrics.sh b/checkmetrics.sh
index 5d846ccc..c3104ca1 100755
--- a/checkmetrics.sh
+++ b/checkmetrics.sh
@@ -5,14 +5,12 @@ if [[ ( -z "$1" ) || ( -z "$2" ) ]]; then
     exit 1
 fi
 
-# Only check node_exporter's metrics, as the Prometheus Go client currently
-# exposes a metric with a unit of microseconds.  Once that is fixed, remove
-# this filter.
-lint=$($1 check metrics < $2 2>&1 | grep "node_")
+# Ignore known issues in auto-generated and network specific collectors.
+lint=$($1 check metrics < "$2" 2>&1 | grep -v -E "^node_(entropy|memory|netstat|wifi_station)_")
 
-if [[ ! -z $lint ]]; then
+if [[ -n $lint ]]; then
     echo -e "Some Prometheus metrics do not follow best practices:\n"
     echo "$lint"
 
     exit 1
-fi
\ No newline at end of file
+fi