diff --git a/Dockerfile b/Dockerfile
index 2833be55..661756fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ COPY public /public
 WORKDIR /public
 RUN npm ci && npm run bundle
 
-FROM golang:1.24.3 as go-builder
+FROM golang:1.26.5 as go-builder
 COPY . /data
 COPY --from=bundle-builder /public/js/bundle* /data/public/js/
 WORKDIR /data
diff --git a/docker-compose.yml b/docker-compose.yml
index 448ef83c..f609b83f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
   command: ["npm", "ci"]
  
  mapserver:
-  image: golang:1.24.3
+  image: golang:1.26.5
   depends_on:
    - minetest
    - mapserver_frontend