diff --git a/Dockerfile b/Dockerfile
index adb1d56..21d8edd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
+ARG RESTIC_VERSION=0.15.1
 FROM golang:1.19-alpine AS builder
 
-ENV RESTIC_VERSION 0.15.1
-
 RUN apk add --no-cache git
 RUN git clone --depth 1 --branch v${RESTIC_VERSION} https://github.com/restic/restic.git /go/src/github.com/restic/restic
 
diff --git a/Makefile b/Makefile
index 5704a0d..1ffaa44 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ORG ?= genunix
-VERSION = $(shell grep "ENV RESTIC_VERSION" Dockerfile | awk '{print $$3}')
+VERSION ?= $(shell grep "ARG RESTIC_VERSION" Dockerfile | cut -d = -f 2)
 PLATFORMS ?= linux/arm/v7,linux/arm64/v8,linux/amd64
 
 build-all: print-version build-version build-latest
@@ -8,7 +8,7 @@ print-version:
 	@echo "Building $(ORG)/restic:$(VERSION) for $(PLATFORMS)"
 
 build-version:
-	docker buildx build --push --platform $(PLATFORMS) --tag $(ORG)/restic:$(VERSION) .
+	docker buildx build --build-arg RESTIC_VERSION=$(VERSION) --push --platform $(PLATFORMS) --tag $(ORG)/restic:$(VERSION) .
 
 build-latest:
-	docker buildx build --push --platform $(PLATFORMS) --tag $(ORG)/restic:latest .
+	docker buildx build --build-arg RESTIC_VERSION=$(VERSION) --push --platform $(PLATFORMS) --tag $(ORG)/restic:latest .