diff --git a/Dockerfile_template b/Dockerfile_template
index 5b590f0..5f30477 100644
--- a/Dockerfile_template
+++ b/Dockerfile_template
@@ -1,4 +1,4 @@
-ARG BUILDER_IMAGE=ghcr.io/geonet/base-images/go:1.21
+ARG BUILDER_IMAGE=ghcr.io/geonet/base-images/golang:1.23.5-alpine3.21
 ARG RUNNER_IMAGE=ghcr.io/geonet/base-images/static:latest
 ARG RUN_USER=nobody
 # Only support image based on AlpineLinux
diff --git a/build.sh b/build.sh
index 3a8d8d5..af7f235 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ if [ $# -eq 0 ]; then
 fi
 
 # code will be compiled in this container
-BUILDER_IMAGE='ghcr.io/geonet/base-images/go:1.21'
+BUILDER_IMAGE='ghcr.io/geonet/base-images/golang:1.23.5-alpine3.21'
 RUNNER_IMAGE='ghcr.io/geonet/base-images/static:latest'
 
 VERSION='git-'$(git rev-parse --short HEAD)
diff --git a/dapper/go.mod b/dapper/go.mod
index c7845e8..cbd9fd4 100644
--- a/dapper/go.mod
+++ b/dapper/go.mod
@@ -1,6 +1,6 @@
 module github.com/GeoNet/fits/dapper
 
-go 1.21.0
+go 1.23
 
 require (
 	github.com/GeoNet/kit v0.0.0-20241129025613-745247c4fb1c
diff --git a/go.mod b/go.mod
index 39c7ed1..6611116 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/GeoNet/fits
 
-go 1.21
+go 1.23
 
 require (
 	github.com/GeoNet/kit v0.0.0-20241129025613-745247c4fb1c