diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1ceea76..ecacc725 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update Go to v1.21.6
+- Access base images from `gsoci.azurecr.io`
+
 ## [6.14.0] - 2023-12-11
 
 - added `jq` util to the image
diff --git a/Dockerfile b/Dockerfile
index 36b4cb62..0fd27594 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM quay.io/giantswarm/helm-chart-testing:v3.10.1 AS ct
+FROM gsoci.azurecr.io/giantswarm/helm-chart-testing:v3.10.1 AS ct
 
-FROM quay.io/giantswarm/app-build-suite:1.2.2 AS abs
+FROM gsoci.azurecr.io/giantswarm/app-build-suite:1.2.2 AS abs
 
-FROM quay.io/giantswarm/golang:1.21.5-alpine3.18 AS golang
+FROM gsoci.azurecr.io/giantswarm/golang:1.21.6-alpine3.18 AS golang
 
-FROM quay.io/giantswarm/conftest:v0.48.0 AS conftest
+FROM gsoci.azurecr.io/giantswarm/conftest:v0.48.0 AS conftest
 
 # Build Image
-FROM quay.io/giantswarm/alpine:3.18
+FROM gsoci.azurecr.io/giantswarm/alpine:3.18
 
 # Copy go from golang image.
 COPY --from=golang /usr/local/go /usr/local/go