diff --git a/2.2/Dockerfile b/2.2/Dockerfile
index 043fc28..bf3c36a 100644
--- a/2.2/Dockerfile
+++ b/2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/2.4/Dockerfile b/2.4/Dockerfile
index a5d1434..c92230b 100644
--- a/2.4/Dockerfile
+++ b/2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/2.6/Dockerfile b/2.6/Dockerfile
index 6534256..c1046ab 100644
--- a/2.6/Dockerfile
+++ b/2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/2.8/Dockerfile b/2.8/Dockerfile
index cc7b95c..f83af92 100644
--- a/2.8/Dockerfile
+++ b/2.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/2.9/Dockerfile b/2.9/Dockerfile
index d7b7865..c3c2df2 100644
--- a/2.9/Dockerfile
+++ b/2.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/3.0/Dockerfile b/3.0/Dockerfile
index 27fbe86..926e3ea 100644
--- a/3.0/Dockerfile
+++ b/3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8
diff --git a/3.1/Dockerfile b/3.1/Dockerfile
index 65bf4b6..9bb8f4d 100644
--- a/3.1/Dockerfile
+++ b/3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.20 AS builder
+FROM golang:alpine AS builder
 
 ENV DATAPLANE_MINOR 3.0.3
 ENV DATAPLANE_V2_MINOR 2.9.8