diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4be4f38..9773ddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog][keepachangelog] and this project adher
 
 ### Added
 
+- Go updated from `1.20` up to `1.21`
 - Error pages now translated into 🇮🇩 [#218]
 - Possibility catch all paths with error page 404 (using `--catch-all` flag for the `serve` or environment variable `CATCH_ALL=true`) [#217]
 
diff --git a/Dockerfile b/Dockerfile
index 006406c..5c1e2b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2
 
 # Image page: <https://hub.docker.com/_/golang>
-FROM golang:1.20-alpine as builder
+FROM golang:1.21-alpine as builder
 
 # can be passed with any prefix (like `v1.2.3@GITHASH`), e.g.: `docker build --build-arg "APP_VERSION=v1.2.3@GITHASH" .`
 ARG APP_VERSION="undefined@docker"
diff --git a/docker-compose.yml b/docker-compose.yml
index d69ea33..d62694c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 
 services:
   app: &app-service
-    image: golang:1.20-buster # Image page: <https://hub.docker.com/_/golang>
+    image: golang:1.21-buster # Image page: <https://hub.docker.com/_/golang>
     working_dir: /src
     environment:
       HOME: /tmp
diff --git a/go.mod b/go.mod
index 5ca036e..8f422d1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module gh.tarampamp.am/error-pages
 
-go 1.20
+go 1.21
 
 require (
 	github.com/a8m/envsubst v1.4.2