diff --git a/Makefile b/Makefile
index 8a72c6b..054a57d 100644
--- a/Makefile
+++ b/Makefile
@@ -57,4 +57,4 @@ golanglint-fix:
 #   make image
 .PHONY: images
 image:
-	@REGISTRY=$(REGISTRY) OUTPUT_TYPE=$(OUTPUT_TYPE) BUILD_PLATFORMS=$(GOOS)/$(GOARCH) hack/build-image.sh $(filter ${DOCKER_TARGETS}, ${WHAT})
+	@REGISTRY=$(REGISTRY) OUTPUT_TYPE=$(OUTPUT_TYPE) BUILD_PLATFORMS=$(GOOS)/$(GOARCH) OS=$(GOOS) ARCH=$(GOARCH) hack/build-image.sh $(filter ${DOCKER_TARGETS}, ${WHAT})
diff --git a/build/dockerfile.bc-cli b/build/dockerfile.bc-cli
index c7e5ed7..d4796db 100644
--- a/build/dockerfile.bc-cli
+++ b/build/dockerfile.bc-cli
@@ -1,9 +1,12 @@
-ARG ARCH
 FROM golang:1.20.2
+ARG ARCH=amd64
+
 WORKDIR /go/src/github.com/bestchains/bc-cli
 COPY . .
 RUN make binary GOARCH=${ARCH} GOOS=linux
 
 FROM alpine:3.16
+ARG ARCH=amd64
+
 COPY --from=0 /go/src/github.com/bestchains/bc-cli/_output/bin/linux/${ARCH}/bc-cli /bin/bc-cli
 WORKDIR /bin
diff --git a/hack/lib/docker.sh b/hack/lib/docker.sh
index e43b01a..05267f3 100755
--- a/hack/lib/docker.sh
+++ b/hack/lib/docker.sh
@@ -36,6 +36,8 @@ function docker::build() {
 		docker buildx build --progress=plain --output=type=$output_type \
 			--platform "${BUILD_PLATFORMS}" \
 			--build-arg ="${target}" \
+			--build-arg ARCH="${ARCH}" \
+			--build-arg OS="${OS}" \
 			--tag "${image_name}" \
 			--file "${ROOT_PATH}/build/dockerfile.${target}" \
 			"${ROOT_PATH}"