From ced595de82e495548ac0383d3e8388ac5911b3ae Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Sat, 26 Jul 2025 10:02:53 +0100
Subject: [PATCH 1/3] Update build.gradle for debian s390x packaging

---
 linux_new/jdk/debian/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux_new/jdk/debian/build.gradle b/linux_new/jdk/debian/build.gradle
index 514636504..4e5b44cad 100644
--- a/linux_new/jdk/debian/build.gradle
+++ b/linux_new/jdk/debian/build.gradle
@@ -144,7 +144,7 @@ if ("$arch" == "s390x") {
 		project.exec {
 			workingDir "src/main/packaging"
 			commandLine "docker", "build", "--no-cache", "--pull",
-				"--build-arg", "IMAGE=s390x/debian:bullseye",
+				"--build-arg", "IMAGE=s390x/debian:bookworm",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 				"-f", "Dockerfile",

From 745ddb1c579fd1ac46c04f91033ec2a1927c2724 Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Sat, 26 Jul 2025 10:04:32 +0100
Subject: [PATCH 2/3] Bump debian packaing image to bookworm for s390x and
 arm32

---
 linux_new/jre/debian/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux_new/jre/debian/build.gradle b/linux_new/jre/debian/build.gradle
index 9236e45cf..8ec23fa7f 100644
--- a/linux_new/jre/debian/build.gradle
+++ b/linux_new/jre/debian/build.gradle
@@ -108,7 +108,7 @@ task packageJreDebian {
 				project.exec {
 					workingDir "src/main/packaging"
 					commandLine "docker", "build", "--no-cache", "--pull",
-						"--build-arg", "IMAGE=arm32v7/debian:bullseye",
+						"--build-arg", "IMAGE=arm32v7/debian:bookworm",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 						"-f", "Dockerfile",
@@ -132,7 +132,7 @@ task packageJreDebian {
 				project.exec {
 					workingDir "src/main/packaging"
 					commandLine "docker", "build", "--no-cache", "--pull",
-						"--build-arg", "IMAGE=s390x/debian:bullseye",
+						"--build-arg", "IMAGE=s390x/debian:bookworm",
 						"-t", "adoptium-packages-linux-jdk-debian",
 						"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 						"-f", "Dockerfile",

From 3c2f0e9739f59e88a103a1574d5367529791ee7b Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Sat, 26 Jul 2025 10:05:29 +0100
Subject: [PATCH 3/3] Update debian package build image to bookworm

---
 linux_new/jdk/debian/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux_new/jdk/debian/build.gradle b/linux_new/jdk/debian/build.gradle
index 4e5b44cad..545f4940c 100644
--- a/linux_new/jdk/debian/build.gradle
+++ b/linux_new/jdk/debian/build.gradle
@@ -108,7 +108,7 @@ if ("$arch" == "armhf") {
 		project.exec {
 			workingDir "src/main/packaging"
 			commandLine "docker", "build", "--no-cache", "--pull",
-				"--build-arg", "IMAGE=arm32v7/debian:bullseye",
+				"--build-arg", "IMAGE=arm32v7/debian:bookworm",
 				"-t", "adoptium-packages-linux-jdk-debian",
 				"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
 				"-f", "Dockerfile",