diff --git a/Dockerfile b/Dockerfile
index ea2cab9f..59c96923 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,11 @@
-FROM php:8.2-zts-bullseye AS php-base
+FROM php:8.2-zts-bookworm AS php-base
+
+FROM golang:1.20-bookworm AS golang-base
 
 FROM php-base AS builder
 
-COPY --from=golang:1.20-bullseye /usr/local/go/bin/go /usr/local/bin/go
-COPY --from=golang:1.20-bullseye /usr/local/go /usr/local/go
+COPY --from=golang-base /usr/local/go/bin/go /usr/local/bin/go
+COPY --from=golang-base /usr/local/go /usr/local/go
 
 # This is required to link the FrankenPHP binary to the PHP binary
 RUN apt-get update && \
@@ -37,7 +39,7 @@ COPY internal internal
 COPY testdata testdata
 
 # todo: automate this?
-# see https://github.com/docker-library/php/blob/master/8.2/bullseye/zts/Dockerfile#L57-L59 for PHP values
+# see https://github.com/docker-library/php/blob/master/8.2/bookworm/zts/Dockerfile#L57-L59 for PHP values
 ENV CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS" CGO_CFLAGS=$PHP_CFLAGS CGO_CPPFLAGS=$PHP_CPPFLAGS
 
 RUN cd caddy/frankenphp && \
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index d799816a..643e558b 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,9 +1,11 @@
 FROM php:8.2-zts-alpine3.18 AS php-base
 
+FROM golang:1.20-alpine3.18 AS golang-base
+
 FROM php-base AS builder
 
-COPY --from=golang:1.20-alpine3.18 /usr/local/go/bin/go /usr/local/bin/go
-COPY --from=golang:1.20-alpine3.18 /usr/local/go /usr/local/go
+COPY --from=golang-base /usr/local/go/bin/go /usr/local/bin/go
+COPY --from=golang-base /usr/local/go /usr/local/go
 
 RUN apk add --no-cache --virtual .build-deps \
 		$PHPIZE_DEPS \
@@ -36,7 +38,7 @@ COPY internal internal
 COPY testdata testdata
 
 # todo: automate this?
-# see https://github.com/docker-library/php/blob/master/8.2-rc/bullseye/zts/Dockerfile#L57-L59 for php values
+# see https://github.com/docker-library/php/blob/master/8.2/bookworm/zts/Dockerfile#L57-L59 for php values
 ENV CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS" CGO_CFLAGS=$PHP_CFLAGS CGO_CPPFLAGS=$PHP_CPPFLAGS
 
 RUN cd caddy/frankenphp && \
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 097762ef..fb8a99ad 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -3,7 +3,7 @@ variable "REPO_NAME" {
 }
 
 group "default" {
-    targets = ["bullseye", "alpine"]
+    targets = ["bookworm", "alpine"]
 }
 
 target "common" {
@@ -14,11 +14,11 @@ target "common" {
 # FrankenPHP
 #
 
-target "bullseye" {
+target "bookworm" {
     inherits = ["common"]
     context = "."
     dockerfile = "Dockerfile"
-    tags = ["${REPO_NAME}:bullseye", "${REPO_NAME}:latest"]
+    tags = ["${REPO_NAME}:bookworm", "${REPO_NAME}:latest"]
 }
 
 target "alpine" {