diff --git a/debian/21/Dockerfile b/debian/21/Dockerfile
index 98bb1dc71..84cc34444 100644
--- a/debian/21/Dockerfile
+++ b/debian/21/Dockerfile
@@ -1,5 +1,5 @@
-ARG BOOKWORM_TAG=20230904
-FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
+ARG DEBIAN_RELEASE=bookworm-20230904
+FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
 ARG JAVA_VERSION
 ARG TARGETPLATFORM
 
@@ -32,7 +32,7 @@ RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \
       cp -r "/opt/jdk-${JAVA_VERSION}" /javaruntime; \
     fi
 
-FROM debian:bookworm-"${BOOKWORM_TAG}" AS build
+FROM debian:"${DEBIAN_RELEASE}" AS build
 
 ARG user=jenkins
 ARG group=jenkins
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 646a21d3a..44adc4a36 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -19,7 +19,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-
+ARG DEBIAN_RELEASE=bookworm-20230904
 ARG JAVA_VERSION=17.0.8.1_1
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-focal AS jre-build
 
@@ -50,7 +50,8 @@ RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \
   else cp -r /opt/java/openjdk /javaruntime; \
   fi
 
-FROM debian:bullseye-20230904 AS build
+
+FROM debian:"${DEBIAN_RELEASE}"-slim AS build
 
 ARG user=jenkins
 ARG group=jenkins
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 721b44725..07d30c3fb 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -73,6 +73,10 @@ variable "ALPINE_SHORT_TAG" {
   default = regex_replace(ALPINE_FULL_TAG, "\\.\\d+$", "")
 }
 
+variable "DEBIAN_RELEASE" {
+  default = "bookworm-20230904"
+}
+
 variable "JAVA11_VERSION" {
   default = "11.0.20.1_1"
 }
@@ -170,8 +174,9 @@ target "debian_jdk11" {
   dockerfile = "debian/Dockerfile"
   context    = "."
   args = {
-    JAVA_VERSION = JAVA11_VERSION
-    VERSION      = REMOTING_VERSION
+    JAVA_VERSION   = JAVA11_VERSION
+    VERSION        = REMOTING_VERSION
+    DEBIAN_RELEASE = DEBIAN_RELEASE
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}" : "",
@@ -189,8 +194,9 @@ target "debian_jdk17" {
   dockerfile = "debian/Dockerfile"
   context    = "."
   args = {
-    JAVA_VERSION = JAVA17_VERSION
-    VERSION      = REMOTING_VERSION,
+    JAVA_VERSION   = JAVA17_VERSION
+    VERSION        = REMOTING_VERSION
+    DEBIAN_RELEASE = DEBIAN_RELEASE
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk17" : "",
@@ -207,8 +213,9 @@ target "debian_jdk21" {
   dockerfile = "debian/21/Dockerfile"
   context    = "."
   args = {
-    JAVA_VERSION = JAVA21_VERSION
-    VERSION      = REMOTING_VERSION,
+    JAVA_VERSION   = JAVA21_VERSION
+    VERSION        = REMOTING_VERSION
+    DEBIAN_RELEASE = DEBIAN_RELEASE
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk21-preview" : "",