diff --git a/build/Dockerfile b/build/Dockerfile
index 11dc360b3..4ee90b9cb 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.18
 FROM golang:${GOLANG_VERSION}
 ARG KUBEBUILDER_VERSION=2.3.1
 
diff --git a/build/test-images.sh b/build/test-images.sh
index 59471b6aa..025e77418 100755
--- a/build/test-images.sh
+++ b/build/test-images.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-docker build --build-arg GOLANG_VERSION=1.15 -t kudobuilder/golang:1.15 .
-docker push kudobuilder/golang:1.15
+docker buildx build --build-arg GOLANG_VERSION=1.18 --platform linux/amd64,linux/arm64,linux/arm/v7 -t kudobuilder/golang:1.18 . --push
 
-docker build --build-arg GOLANG_VERSION=latest -t kudobuilder/golang:latest .
-docker push kudobuilder/golang:latest
+docker buildx build --build-arg GOLANG_VERSION=latest --platform linux/amd64,linux/arm64,linux/arm/v7 -t kudobuilder/golang:latest . --push