diff --git a/cmd/cloud-run/cors-proxy/Dockerfile b/cmd/cloud-run/cors-proxy/Dockerfile
index d35f0f721834..feb46cfc983d 100644
--- a/cmd/cloud-run/cors-proxy/Dockerfile
+++ b/cmd/cloud-run/cors-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/create-github-issue/Dockerfile b/cmd/cloud-run/create-github-issue/Dockerfile
index c117a4f86dfd..47fd4ad12dbc 100644
--- a/cmd/cloud-run/create-github-issue/Dockerfile
+++ b/cmd/cloud-run/create-github-issue/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/github-webhook-gateway/Dockerfile b/cmd/cloud-run/github-webhook-gateway/Dockerfile
index a00b7f4b6aca..d02060a0ef93 100644
--- a/cmd/cloud-run/github-webhook-gateway/Dockerfile
+++ b/cmd/cloud-run/github-webhook-gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/move-gcs-bucket/Dockerfile b/cmd/cloud-run/move-gcs-bucket/Dockerfile
index 205492ae9a60..e8c14f1451f0 100644
--- a/cmd/cloud-run/move-gcs-bucket/Dockerfile
+++ b/cmd/cloud-run/move-gcs-bucket/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/rotate-service-account/Dockerfile b/cmd/cloud-run/rotate-service-account/Dockerfile
index 64b40a648176..d1cd18ba6866 100644
--- a/cmd/cloud-run/rotate-service-account/Dockerfile
+++ b/cmd/cloud-run/rotate-service-account/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4-alpine3.20 as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /go/src/github.com/kyma-project/test-infra
 COPY . .
diff --git a/cmd/cloud-run/scan-logs-for-secrets/Dockerfile b/cmd/cloud-run/scan-logs-for-secrets/Dockerfile
index 1931926fb04d..3eef29beeaf7 100644
--- a/cmd/cloud-run/scan-logs-for-secrets/Dockerfile
+++ b/cmd/cloud-run/scan-logs-for-secrets/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/search-github-issue/Dockerfile b/cmd/cloud-run/search-github-issue/Dockerfile
index c98c688d57a8..f94d99c6a0a7 100644
--- a/cmd/cloud-run/search-github-issue/Dockerfile
+++ b/cmd/cloud-run/search-github-issue/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/cloud-run/service-account-keys-cleaner/Dockerfile b/cmd/cloud-run/service-account-keys-cleaner/Dockerfile
index cdc27105c2b8..c2c8334cb7ff 100644
--- a/cmd/cloud-run/service-account-keys-cleaner/Dockerfile
+++ b/cmd/cloud-run/service-account-keys-cleaner/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4-alpine3.20 as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /go/src/github.com/kyma-project/test-infra
 COPY . .
diff --git a/cmd/dashboard-token-proxy/Dockerfile b/cmd/dashboard-token-proxy/Dockerfile
index fd1f4a53485a..c8f27a236cd2 100644
--- a/cmd/dashboard-token-proxy/Dockerfile
+++ b/cmd/dashboard-token-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/external-plugins/automated-approver/Dockerfile b/cmd/external-plugins/automated-approver/Dockerfile
index 3c5ba1aa6b44..6b0ef7c2fa2c 100644
--- a/cmd/external-plugins/automated-approver/Dockerfile
+++ b/cmd/external-plugins/automated-approver/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/image-autobumper/Dockerfile b/cmd/image-autobumper/Dockerfile
index 6b58658b1a97..872a7116e24a 100644
--- a/cmd/image-autobumper/Dockerfile
+++ b/cmd/image-autobumper/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/image-detector/Dockerfile b/cmd/image-detector/Dockerfile
index 789b4db43648..af17ff9ab4c6 100644
--- a/cmd/image-detector/Dockerfile
+++ b/cmd/image-detector/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/image-syncer/Dockerfile b/cmd/image-syncer/Dockerfile
index ec4d10454849..9eee71793663 100644
--- a/cmd/image-syncer/Dockerfile
+++ b/cmd/image-syncer/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build the Go app
-FROM golang:1.23.1-alpine3.20 as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 # Install certificate authorities
 RUN apk update && apk add --no-cache ca-certificates
diff --git a/cmd/image-url-helper/Dockerfile b/cmd/image-url-helper/Dockerfile
index 71e8be42f121..dcf50eedf56b 100644
--- a/cmd/image-url-helper/Dockerfile
+++ b/cmd/image-url-helper/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/markdown-index/Dockerfile b/cmd/markdown-index/Dockerfile
index 4a121ee786ff..5020d7f7d66e 100644
--- a/cmd/markdown-index/Dockerfile
+++ b/cmd/markdown-index/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/oidc-token-verifier/Dockerfile b/cmd/oidc-token-verifier/Dockerfile
index 7d7690f2a4d7..b8d23b95d255 100644
--- a/cmd/oidc-token-verifier/Dockerfile
+++ b/cmd/oidc-token-verifier/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.3-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 # Add certificate authorities certificates.
 # This let oidctokenverifier to use tls connection to the OIDC provider.
diff --git a/cmd/tools/externalsecretschecker/Dockerfile b/cmd/tools/externalsecretschecker/Dockerfile
index b31efedc1c1a..f6c7a3bdffa5 100644
--- a/cmd/tools/externalsecretschecker/Dockerfile
+++ b/cmd/tools/externalsecretschecker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/cmd/tools/usersmapchecker/Dockerfile b/cmd/tools/usersmapchecker/Dockerfile
index b9b4c3cd860a..e1d676a7c9c2 100644
--- a/cmd/tools/usersmapchecker/Dockerfile
+++ b/cmd/tools/usersmapchecker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.23.4-alpine3.21 as builder
 
 WORKDIR /app
 
diff --git a/images/e2e-gcloud/Dockerfile b/images/e2e-gcloud/Dockerfile
index 8195d51352a8..fedb028a042a 100644
--- a/images/e2e-gcloud/Dockerfile
+++ b/images/e2e-gcloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4-alpine as base
+FROM golang:1.23.4-alpine3.21 as base
 
 RUN set -eux; \
     apk upgrade --no-cache; \