diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 355ffd2..6262fcb 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -7,7 +7,6 @@ on:
 
 env:
   IMAGE_NAME: docker-php-base-image
-  COMPOSER_VERSION: ${{ vars.COMPOSER_VERSION }}
 
 jobs:
   test:
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
index 2365a5b..fe4f357 100644
--- a/8.3/Dockerfile
+++ b/8.3/Dockerfile
@@ -1,6 +1,6 @@
 ARG PHPVER
 
-FROM golang:1.22.0-alpine3.18 as mailhog
+FROM golang:1.23.0-alpine3.20 as mailhog
 
 # Install mailhog.
 ENV MAILHOG_VERSION 1.0.1
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index 0e84167..d2b266d 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -1,6 +1,6 @@
 ARG PHPVER
 
-FROM golang:1.22.0-alpine3.18 as mailhog
+FROM golang:1.23.0-alpine3.20 as mailhog
 
 # Install mailhog.
 ENV MAILHOG_VERSION 1.0.1
diff --git a/8/Dockerfile b/8/Dockerfile
index 4041525..e9beee2 100644
--- a/8/Dockerfile
+++ b/8/Dockerfile
@@ -1,6 +1,6 @@
 ARG PHPVER
 
-FROM golang:1.22.0-alpine3.18 as mailhog
+FROM golang:1.23.0-alpine3.20 as mailhog
 
 # Install mailhog.
 ENV MAILHOG_VERSION 1.0.1
diff --git a/Makefile b/Makefile
index d354561..da83b92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: shellcheck
 
-COMPOSER_VERSION ?= 2.8.1
+COMPOSER_VERSION = 2.8.9
 
 # build-7-1-11: build-test-image
 # 	docker buildx build --load -t sparkfabrik/docker-php-base-image:7.1.11-fpm-alpine3.4 7.1.11-fpm-alpine3.4