diff --git a/Dockerfile b/Dockerfile
index ecfb9c9e6..81abfdc56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-buster
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-buster
 ARG RELEASE_IMAGE=scratch
 FROM ${GO_IMAGE} as builder
 
diff --git a/krm-functions/cloud-init/Dockerfile b/krm-functions/cloud-init/Dockerfile
index 976b7beb0..5b4f86f2c 100644
--- a/krm-functions/cloud-init/Dockerfile
+++ b/krm-functions/cloud-init/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-buster
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-buster
 ARG RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 FROM ${GO_IMAGE} as builder
 ARG GOPROXY=""
diff --git a/krm-functions/clusterctl/Dockerfile b/krm-functions/clusterctl/Dockerfile
index b4c1d4bbc..da24dfa58 100644
--- a/krm-functions/clusterctl/Dockerfile
+++ b/krm-functions/clusterctl/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-alpine
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-alpine
 ARG PLUGINS_BUILD_IMAGE=quay.io/airshipit/alpine:3.13.5
 ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 
diff --git a/krm-functions/kubeval-validator/Dockerfile b/krm-functions/kubeval-validator/Dockerfile
index 45d0f4931..7504a85c9 100644
--- a/krm-functions/kubeval-validator/Dockerfile
+++ b/krm-functions/kubeval-validator/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-alpine
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-alpine
 ARG PLUGINS_RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 FROM ${GO_IMAGE} as function
 ARG GOPROXY=""
diff --git a/krm-functions/replacement-transformer/Dockerfile b/krm-functions/replacement-transformer/Dockerfile
index dffea09cb..4e6a6ee55 100644
--- a/krm-functions/replacement-transformer/Dockerfile
+++ b/krm-functions/replacement-transformer/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-buster
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-buster
 ARG RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 FROM ${GO_IMAGE} as builder
 ARG GOPROXY=""
diff --git a/krm-functions/templater/Dockerfile b/krm-functions/templater/Dockerfile
index b2bd3c351..3a06643ea 100644
--- a/krm-functions/templater/Dockerfile
+++ b/krm-functions/templater/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-buster
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-buster
 ARG RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 FROM ${GO_IMAGE} as builder
 ARG GOPROXY=""
diff --git a/krm-functions/toolbox/Dockerfile b/krm-functions/toolbox/Dockerfile
index d70d48883..0d61aa46c 100644
--- a/krm-functions/toolbox/Dockerfile
+++ b/krm-functions/toolbox/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_IMAGE=amd64/golang:1.16.6-buster
+ARG GO_IMAGE=quay.io/airshipit/golang:1.16.8-buster
 ARG BUILD_IMAGE=quay.io/airshipit/alpine:3.13.5
 ARG RELEASE_IMAGE=quay.io/airshipit/alpine:3.13.5
 FROM ${BUILD_IMAGE} as ctls