diff --git a/Dockerfile.test b/Dockerfile.test
index 8141c725..49e5d153 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.22
+ARG GOLANG_VERSION=1.23
 FROM golang:$GOLANG_VERSION
 
 RUN echo $GOLANG_VERSION
diff --git a/Makefile b/Makefile
index 63ecb520..583d536f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 VERSION = "unset"
 DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
 
-GOLANGCI_LINT_VERSION=v1.51.2
+GOLANGCI_LINT_VERSION=v1.61.0
 
 ifndef GOLANG_VERSION
-override GOLANG_VERSION = 1.22.4
+override GOLANG_VERSION = 1.23.2
 endif
 
 .PHONY: build
diff --git a/appveyor.yml b/appveyor.yml
index f58325e2..35dcd3e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
   GOPROXY: https://proxy.golang.org
   SKIP_UNTIL_113: true
 
-stack: go 1.22
+stack: go 1.23
 
 test_script:
   - go version
diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile
index ba23e392..2e0dcc40 100644
--- a/cmd/proxy/Dockerfile
+++ b/cmd/proxy/Dockerfile
@@ -5,8 +5,8 @@
 # You can override the Go version used to build the image.
 # See project Makefile if using make.
 # See docker --build-arg if building directly.
-ARG GOLANG_VERSION=1.22
-ARG ALPINE_VERSION=3.17
+ARG GOLANG_VERSION=1.23
+ARG ALPINE_VERSION=3.20
 
 FROM golang:${GOLANG_VERSION}-alpine AS builder
 
diff --git a/docker-compose.yml b/docker-compose.yml
index de7afed8..8c966af1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: cmd/proxy/Dockerfile
       args:
-        GOLANG_VERSION: "1.22"
+        GOLANG_VERSION: "1.23"
     environment:
       - ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017
       - TIMEOUT=20 # in case the mongo dependency takes longer to start up
@@ -20,7 +20,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: "1.22"
+        GOLANG_VERSION: "1.23"
     command: ["./scripts/test_unit.sh"]
     environment:
       - GO_ENV=test
@@ -36,7 +36,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: "1.22"
+        GOLANG_VERSION: "1.23"
     command: ["./scripts/test_e2e.sh"]
   azurite:
     image: arafato/azurite:2.6.5
diff --git a/go.mod b/go.mod
index 9af8a011..f82a722b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/gomods/athens
 
-go 1.22.7
-
-toolchain go1.23.2
+go 1.23.2
 
 require (
 	cloud.google.com/go/storage v1.45.0
diff --git a/scripts/build-image/Dockerfile b/scripts/build-image/Dockerfile
index 86df5295..de9e44bd 100644
--- a/scripts/build-image/Dockerfile
+++ b/scripts/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye
+FROM golang:1.23-bookworm
 
 WORKDIR /tmp