diff --git a/build/build.sh b/build/build.sh
index 05332b149b..e06135531d 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -19,7 +19,7 @@ set -e
 export GOOS=${GOOS:-$(go env GOOS)}
 export GOARCH=${GOARCH:-$(go env GOARCH)}
 export CGO_ENABLED=${GO_CGO_ENABLED:-"1"}
-GO_FLAGS=${GO_FLAGS:-"-tags netgo"}    # Extra go flags to use in the build.
+GO_FLAGS=${GO_FLAGS:-"-tags=netgo"}    # Extra go flags to use in the build.
 BUILD_USER=${BUILD_USER:-"${USER}@${HOSTNAME}"}
 BUILD_DATE=${BUILD_DATE:-$( date +%Y%m%d-%H:%M:%S )}
 VERBOSE=${VERBOSE:-}
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 6b533ebc05..0bd5b7deb7 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -40,7 +40,7 @@ ADD . .
 ARG VERSION
 
 # libipmctl only works on x86_64 CPUs.
-RUN export GO_TAGS="-tags=libfpm,netgo"; \
+RUN export GO_TAGS="libpfm,netgo"; \
     if [ "$(uname --machine)" = "x86_64" ]; then \
           export GO_TAGS="$GO_TAGS,libipmctl"; \
     fi; \