diff --git a/Makefile b/Makefile
index 517ca46ce..cfeecc8d3 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,9 @@ every-build: check-reqs
 show:
 	@$(bake_cli) linux --print
 
+show-%:
+	@$(bake_cli) $* --print
+
 list: check-reqs
 	@set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$(ARCH)"))?) | add'
 
diff --git a/README.md b/README.md
index 02e4b7151..eb9c5cb7d 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ make every-build
 
 #### Other `make` targets
 
-`show` gives us a detailed view of the images that will be built, with the tags, platforms, and Dockerfiles.
+`show` (and `show-windows`) gives us a detailed view of the images that could be built, with tags, platforms, and Dockerfiles.
 
 ```bash
 $ make show
@@ -170,6 +170,36 @@ $ make show
     [...]
 ```
 
+To view all tags, set `ON_TAG` (and eventually `BUILD_NUMBER`):
+```bash
+$ ON_TAG=true BUILD_NUMBER=3 make show
+[...]
+  "target": {
+    "agent_alpine_jdk17": {
+      "context": ".",
+      "dockerfile": "alpine/Dockerfile",
+      "args": {
+        "ALPINE_TAG": "3.21.3",
+        "JAVA_VERSION": "17.0.14_7",
+        "VERSION": "3283.v92c105e0f819"
+      },
+      "tags": [
+        "docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine-jdk17",
+        "docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21-jdk17",
+        "docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine",
+        "docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21",
+        "docker.io/jenkins/agent:alpine",
+        "docker.io/jenkins/agent:alpine3.21",
+        "docker.io/jenkins/agent:latest-alpine",
+        "docker.io/jenkins/agent:latest-alpine3.21",
+        "docker.io/jenkins/agent:alpine-jdk17",
+        "docker.io/jenkins/agent:alpine3.21-jdk17",
+        "docker.io/jenkins/agent:latest-alpine-jdk17",
+        "docker.io/jenkins/agent:latest-alpine3.21-jdk17"
+      ],
+      [...]
+```
+
 `bats` is a dependency target. It will update the [`bats` submodule](https://github.com/bats-core/bats-core) and run the tests.
 
 ```bash
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0a97fee1e..25b694769 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -304,7 +304,7 @@ target "debian" {
 target "rhel_ubi9" {
   matrix = {
     type = agent_types_to_build
-    jdk  = [17, 21]
+    jdk  = jdks_to_build
   }
   name       = "${type}_rhel_ubi9_jdk${jdk}"
   target     = type