diff --git a/Dockerfile.openshift b/Dockerfile.openshift
index feaefc7911..38671a3f2a 100644
--- a/Dockerfile.openshift
+++ b/Dockerfile.openshift
@@ -1,7 +1,7 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY . .
-RUN make
+RUN make ARCH=$(go env GOARCH)
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 # Get mkfs & blkid
diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
index 47d254cf6b..d200d848e9 100644
--- a/Dockerfile.openshift.rhel7
+++ b/Dockerfile.openshift.rhel7
@@ -1,7 +1,7 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY . .
-RUN make
+RUN make ARCH=$(go env GOARCH)
 
 FROM registry.ci.openshift.org/ocp/4.11:base
 # Get mkfs & blkid