diff --git a/images/custom-scorecard-tests/Dockerfile b/images/custom-scorecard-tests/Dockerfile
index 95a81e0231..5fc6942577 100644
--- a/images/custom-scorecard-tests/Dockerfile
+++ b/images/custom-scorecard-tests/Dockerfile
@@ -1,5 +1,5 @@
 # Build the custom-scorecard-tests binary
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 ARG TARGETARCH
 
 WORKDIR /workspace
diff --git a/images/helm-operator/Dockerfile b/images/helm-operator/Dockerfile
index 35036a7eea..8e3c7eeca8 100644
--- a/images/helm-operator/Dockerfile
+++ b/images/helm-operator/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 ARG TARGETARCH
 
 WORKDIR /workspace
diff --git a/images/operator-sdk/Dockerfile b/images/operator-sdk/Dockerfile
index 775d998f16..e94935fb93 100644
--- a/images/operator-sdk/Dockerfile
+++ b/images/operator-sdk/Dockerfile
@@ -1,5 +1,5 @@
 # Build the operator-sdk binary
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 ARG TARGETARCH
 
 WORKDIR /workspace
@@ -19,7 +19,7 @@ RUN GOOS=linux GOARCH=$TARGETARCH make build/operator-sdk
 # Final image.
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
 
-ENV GO_VERSION 1.19
+ENV GO_VERSION 1.21
 
 ARG TARGETARCH
 RUN microdnf install -y make gcc which tar gzip
diff --git a/images/scorecard-test-kuttl/Dockerfile b/images/scorecard-test-kuttl/Dockerfile
index 0c4f9d81d4..0c38e0ab3e 100644
--- a/images/scorecard-test-kuttl/Dockerfile
+++ b/images/scorecard-test-kuttl/Dockerfile
@@ -1,5 +1,5 @@
 # Build the scorecard-test-kuttl binary
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 ARG TARGETARCH
 ARG BUILDPLATFORM
 
diff --git a/images/scorecard-test/Dockerfile b/images/scorecard-test/Dockerfile
index cf417394cb..e3c49c5d3a 100644
--- a/images/scorecard-test/Dockerfile
+++ b/images/scorecard-test/Dockerfile
@@ -1,5 +1,5 @@
 # Build the scorecard-test binary
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 ARG TARGETARCH
 
 WORKDIR /workspace