diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile
index 060744910..88c59de55 100644
--- a/pkg/binfmt/Dockerfile
+++ b/pkg/binfmt/Dockerfile
@@ -12,6 +12,8 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 
 COPY . /go/src/binfmt/
 RUN go-compile.sh /go/src/binfmt
diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile
index 96a6101a3..73eb700cc 100644
--- a/pkg/extend/Dockerfile
+++ b/pkg/extend/Dockerfile
@@ -19,6 +19,9 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build
 
 RUN apk add --no-cache go musl-dev
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
+
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile
index 42a613cae..2aa334d8a 100644
--- a/pkg/format/Dockerfile
+++ b/pkg/format/Dockerfile
@@ -21,6 +21,8 @@ RUN apk add --no-cache go musl-dev
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 
 COPY . /go/src/format/
 RUN go-compile.sh /go/src/format
diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile
index 38697c47d..e472be7ad 100644
--- a/pkg/host-timesync-daemon/Dockerfile
+++ b/pkg/host-timesync-daemon/Dockerfile
@@ -2,6 +2,8 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev git
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 
 COPY . /go/src/host-timesync-daemon
 RUN go-compile.sh /go/src/host-timesync-daemon
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index b575836e8..f88cf903a 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -7,6 +7,9 @@ RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper
 
 RUN apk add --no-cache go musl-dev
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
+
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile
index 767587479..378751479 100644
--- a/pkg/kmsg/Dockerfile
+++ b/pkg/kmsg/Dockerfile
@@ -1,7 +1,10 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev linux-headers
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
+
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile
index 505ef3677..e5cb9b460 100644
--- a/pkg/logwrite/Dockerfile
+++ b/pkg/logwrite/Dockerfile
@@ -1,7 +1,10 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build
 
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
+
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile
index 141dde349..589684dee 100644
--- a/pkg/memlogd/Dockerfile
+++ b/pkg/memlogd/Dockerfile
@@ -1,6 +1,8 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build
 
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile
index c612a31fb..928c68b4e 100644
--- a/pkg/metadata/Dockerfile
+++ b/pkg/metadata/Dockerfile
@@ -1,6 +1,8 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev linux-headers
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile
index 09b30198f..f1ccf3326 100644
--- a/pkg/mount/Dockerfile
+++ b/pkg/mount/Dockerfile
@@ -12,6 +12,8 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build
 
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile
index 8834c9d5d..47bac9fae 100644
--- a/pkg/rngd/Dockerfile
+++ b/pkg/rngd/Dockerfile
@@ -1,6 +1,8 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go gcc musl-dev linux-headers
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile
index a1ec532ba..7f60cfccd 100644
--- a/pkg/sysctl/Dockerfile
+++ b/pkg/sysctl/Dockerfile
@@ -1,6 +1,8 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile
index a7e053775..b08f2a8b7 100644
--- a/pkg/sysfs/Dockerfile
+++ b/pkg/sysfs/Dockerfile
@@ -1,6 +1,8 @@
 FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror
 
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile
index 82b5ec9b4..2d8188977 100644
--- a/pkg/trim-after-delete/Dockerfile
+++ b/pkg/trim-after-delete/Dockerfile
@@ -11,6 +11,8 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
 # We also need the Go binary which calls it:
 RUN apk add --no-cache go musl-dev
+ARG GOPKGVERSION
+ENV ldflags="-X main.Version=$GOPKGVERSION"
 ENV GOPATH=/go PATH=$PATH:/go/bin
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true