diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 02ce366..6d8c94b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: [8-2-3, 8-1-16, 8-1-10]
+        tag: [8-3-2, 8-2-3, 8-1-16]
         flavour: ["", "-rootless"]
     steps:
       - uses: actions/checkout@v3
@@ -36,8 +36,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     strategy:
       matrix:
-        tag:
-          [8.1.10-fpm-alpine3.16, 8.1.16-fpm-alpine3.16, 8.2.3-fpm-alpine3.16]
+        tag: [8.3.2-fpm-alpine3.18, 8.2.3-fpm-alpine3.16, 8.1.16-fpm-alpine3.16]
         flavour: ["", "-rootless"]
     steps:
       - uses: actions/checkout@v3
diff --git a/8/Dockerfile b/8/Dockerfile
index 307240c..82a7d8c 100644
--- a/8/Dockerfile
+++ b/8/Dockerfile
@@ -1,11 +1,11 @@
 ARG PHPVER
 
-FROM golang:1.16.6-alpine3.14 as mailhog
+FROM golang:1.22.0-alpine3.18 as mailhog
 
 # Install mailhog.
 ENV MAILHOG_VERSION 1.0.1
 RUN apk add git && \
-    go get github.com/mailhog/MailHog@v${MAILHOG_VERSION} && \
+    go install github.com/mailhog/MailHog@v${MAILHOG_VERSION} && \
     mv /go/bin/MailHog /go/mailhog
 
 FROM php:$PHPVER as dist
@@ -35,7 +35,7 @@ ENV PHP_FPM_MIN_SPARE_SERVERS 1
 ENV PHP_FPM_MAX_SPARE_SERVERS 3
 ENV PHP_FPM_PM_STATUS_PATH /status
 
-ENV XDEBUG_VERSION 3.2.0
+ENV XDEBUG_VERSION 3.3.1
 ENV MEMCACHE_VERSION 3.2.0
 ENV PHPREDIS_VERSION 5.3.7
 RUN export XDEBUG_DEPS="linux-headers" && \
diff --git a/Makefile b/Makefile
index ac0ae55..589ca1a 100644
--- a/Makefile
+++ b/Makefile
@@ -134,11 +134,11 @@ COMPOSER_VERSION ?= 2.5.4
 # build-8-1-12-rootless: PHPVER=8.1.12-fpm-alpine3.16
 # build-8-1-12-rootless: build-rootless-template
 
-build-8-1-10: PHPVER=8.1.10-fpm-alpine3.16
-build-8-1-10: build-template
+# build-8-1-10: PHPVER=8.1.10-fpm-alpine3.16
+# build-8-1-10: build-template
 
-build-8-1-10-rootless: PHPVER=8.1.10-fpm-alpine3.16
-build-8-1-10-rootless: build-rootless-template
+# build-8-1-10-rootless: PHPVER=8.1.10-fpm-alpine3.16
+# build-8-1-10-rootless: build-rootless-template
 
 build-8-1-16: PHPVER=8.1.16-fpm-alpine3.16
 build-8-1-16: build-template
@@ -152,6 +152,12 @@ build-8-2-3: build-template
 build-8-2-3-rootless: PHPVER=8.2.3-fpm-alpine3.16
 build-8-2-3-rootless: build-rootless-template
 
+build-8-3-2: PHPVER=8.3.2-fpm-alpine3.18
+build-8-3-2: build-template
+
+build-8-3-2-rootless: PHPVER=8.3.2-fpm-alpine3.18
+build-8-3-2-rootless: build-rootless-template
+
 
 build-template: guessing-folder build-test-image
 	docker buildx build \