diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7e4265517..49f7b9aed 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,18 +2,6 @@
 version: 2
 updates:
 
-# Arch Linux
-- package-ecosystem: docker
-  directory: "archlinux"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  reviewers:
-  - MarkEWaite
-  labels:
-  - dependencies
-
 # GitHub actions
 - package-ecosystem: "github-actions"
   target-branch: master
diff --git a/Makefile b/Makefile
index f2b32cd88..48352eb9c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ bake_base_cli := docker buildx bake --file docker-bake.hcl
 bake_cli := $(bake_base_cli) --load
 
 .PHONY: build
-.PHONY: test test-alpine test-archlinux test-debian test-jdk11 test-jdk11-alpine
+.PHONY: test test-alpine test-debian
 
 check-reqs:
 ## Build requirements
diff --git a/README.md b/README.md
index 5986037ec..02e4b7151 100644
--- a/README.md
+++ b/README.md
@@ -30,19 +30,14 @@ If you want to see the target images (matching your current architecture) that w
 
 ```bash
 $ make list
-agent_alpine_jdk11
 agent_alpine_jdk17
 agent_alpine_jdk21
-agent_archlinux_jdk11
-agent_debian_jdk11
 agent_debian_jdk17
 agent_debian_jdk21
 agent_rhel_ubi9_jdk17
 agent_rhel_ubi9_jdk21
-inbound-agent_alpine_jdk11
 inbound-agent_alpine_jdk17
 inbound-agent_alpine_jdk21
-inbound-agent_debian_jdk11
 inbound-agent_debian_jdk17
 inbound-agent_debian_jdk21
 inbound-agent_rhel_ubi9_jdk17
@@ -110,20 +105,16 @@ $ make show
   "group": {
     "alpine": {
       "targets": [
-        "agent_alpine_jdk11",
         "agent_alpine_jdk17",
         "agent_alpine_jdk21",
-        "inbound-agent_alpine_jdk11",
         "inbound-agent_alpine_jdk17",
         "inbound-agent_alpine_jdk21"
       ]
     },
     "debian": {
       "targets": [
-        "agent_debian_jdk11",
         "agent_debian_jdk17",
         "agent_debian_jdk21",
-        "inbound-agent_debian_jdk11",
         "inbound-agent_debian_jdk17",
         "inbound-agent_debian_jdk21"
       ]
@@ -135,7 +126,6 @@ $ make show
     },
     "linux": {
       "targets": [
-        "agent_archlinux_jdk11",
         "alpine",
         "debian",
         "rhel_ubi9"
@@ -151,19 +141,23 @@ $ make show
     }
   },
   "target": {
-    "agent_alpine_jdk11": {
+    "agent_alpine_jdk17": {
       "context": ".",
       "dockerfile": "alpine/Dockerfile",
       "args": {
-        "ALPINE_TAG": "3.20.1",
-        "JAVA_VERSION": "11.0.23_9",
-        "VERSION": "3256.v88a_f6e922152"
+        "ALPINE_TAG": "3.20.3",
+        "JAVA_VERSION": "17.0.12_7",
+        "VERSION": "3261.v9c670a_4748a_9"
       },
       "tags": [
-        "docker.io/jenkins/agent:alpine-jdk11",
-        "docker.io/jenkins/agent:alpine3.20-jdk11",
-        "docker.io/jenkins/agent:latest-alpine-jdk11",
-        "docker.io/jenkins/agent:latest-alpine3.20-jdk11"
+        "docker.io/jenkins/agent:alpine",
+        "docker.io/jenkins/agent:alpine3.20",
+        "docker.io/jenkins/agent:latest-alpine",
+        "docker.io/jenkins/agent:latest-alpine3.20",
+        "docker.io/jenkins/agent:alpine-jdk17",
+        "docker.io/jenkins/agent:alpine3.20-jdk17",
+        "docker.io/jenkins/agent:latest-alpine-jdk17",
+        "docker.io/jenkins/agent:latest-alpine3.20-jdk17"
       ],
       "target": "agent",
       "platforms": [
diff --git a/README_agent.md b/README_agent.md
index 52a74829e..486985932 100644
--- a/README_agent.md
+++ b/README_agent.md
@@ -43,7 +43,7 @@ docker run -i --rm --name agent1 --init -v agent1-workdir:/home/jenkins/agent je
 Call example for Windows Containers:
 
 ```powershell
-docker run -i --rm --name agent1 --init -v agent1-workdir:C:/Users/jenkins/Work jenkins/agent:jdk11-windowsservercore-ltsc2019 java -jar C:/ProgramData/Jenkins/agent.jar -workDir C:/Users/jenkins/Work
+docker run -i --rm --name agent1 --init -v agent1-workdir:C:/Users/jenkins/Work jenkins/agent:jdk17-windowsservercore-ltsc2019 java -jar C:/ProgramData/Jenkins/agent.jar -workDir C:/Users/jenkins/Work
 ```
 
 ## Configurations
@@ -83,22 +83,6 @@ The image has several supported configurations, which can be accessed via the fo
     * rhel-ubi9 (Based on Red Hat Universal Base Image 9)
       * `jenkins/agent:rhel-ubi9-jdk21`
       * `jenkins/agent:latest-rhel-ubi9-jdk21`
-  * Java 11:
-    * bookworm (Based on `debian:bookworm-${builddate}`):
-      * `jenkins/agent:bookworm`
-      * `jenkins/agent:bookworm-jdk11`
-      * `jenkins/agent:jdk11`
-      * `jenkins/agent:latest-bookworm-jdk11`
-    * alpine (Small image based on Alpine Linux, based on `alpine:${version}`):
-      * `jenkins/agent:alpine` 
-      * `jenkins/agent:alpine-jdk11`
-      * `jenkins/agent:latest-alpine`
-      * `jenkins/agent:latest-alpine-jdk11`
-    * archlinux (Image based on Arch Linux, based on `archlinux:latest`):
-      * `jenkins/agent:archlinux`
-      * `jenkins/agent:archlinux-jdk11`
-      * `jenkins/agent:latest-archlinux`
-      * `jenkins/agent:latest-archlinux-jdk11`
 
 * Windows Images:
   * Java 17 (default):
@@ -106,10 +90,6 @@ The image has several supported configurations, which can be accessed via the fo
       * `jenkins/agent:jdk17-nanoserver-1809`
       * `jenkins/agent:jdk17-nanoserver-ltsc2019`
       * `jenkins/agent:jdk17-nanoserver-ltsc2022`
-    * Latest Jenkins agent version on Windows Server Core with Java 11:
-      * `jenkins/agent:jdk17-windowsservercore-1809`
-      * `jenkins/agent:jdk17-windowsservercore-ltsc2019`
-      * `jenkins/agent:jdk17-windowsservercore-ltsc2022`
   * Java 21:
     * Latest Jenkins agent version on Windows Nano Server and Java 21:
       * `jenkins/agent:jdk21-nanoserver-1809`
@@ -119,15 +99,6 @@ The image has several supported configurations, which can be accessed via the fo
       * `jenkins/agent:jdk21-windowsservercore-1809`
       * `jenkins/agent:jdk21-windowsservercore-ltsc2019`
       * `jenkins/agent:jdk21-windowsservercore-ltsc2022`
-  * Java 11:
-    * Latest Jenkins agent version on Windows Nano Server and Java 11:
-      * `jenkins/agent:jdk11-nanoserver-1809`
-      * `jenkins/agent:jdk11-nanoserver-ltsc2019`
-      * `jenkins/agent:jdk11-nanoserver-ltsc2022`
-    * Latest Jenkins agent version on Windows Server Core with Java 11:
-      * `jenkins/agent:jdk11-windowsservercore-1809`
-      * `jenkins/agent:jdk11-windowsservercore-ltsc2019`
-      * `jenkins/agent:jdk11-windowsservercore-ltsc2022`
 
 The file [docker-bake.hcl](https://github.com/jenkinsci/docker-agent/blob/master/docker-bake.hcl) defines all the configuration for Linux images and their associated tags.
 
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 576df9e0b..2d9e0928d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -42,16 +42,14 @@ RUN apk add --no-cache \
 ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 
 RUN case "$(jlink --version 2>&1)" in \
-      # jlink version 11 has less features than JDK17+
-      "11."*) set -- "--strip-debug" "--compress=2" ;; \
-      "17."*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
+      "17."*) set -- "--compress=2" ;; \
       # the compression argument is different for JDK21
-      "21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
+      "21."*) set -- "--compress=zip-6" ;; \
       *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
     esac; \
     jlink \
+      --strip-java-debug-attributes \
       "$1" \
-      "$2" \
       --add-modules ALL-MODULE-PATH \
       --no-man-pages \
       --no-header-files \
diff --git a/archlinux/Dockerfile b/archlinux/Dockerfile
deleted file mode 100644
index 48e1a7db2..000000000
--- a/archlinux/Dockerfile
+++ /dev/null
@@ -1,94 +0,0 @@
-# The MIT License
-#
-#  Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  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.
-
-FROM archlinux:base-20240929.0.266368 AS jre-build
-
-# This Build ARG is populated by Docker
-# Ref. https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETPLATFORM
-
-SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
-
-COPY adoptium-get-jdk-link.sh /usr/bin/local/adoptium-get-jdk-link.sh
-COPY adoptium-install-jdk.sh /usr/bin/local/adoptium-install-jdk.sh
-
-ARG JAVA_VERSION=17.0.10_7
-# hadolint ignore=DL3008
-RUN pacman -Syu --noconfirm \
-    ca-certificates \
-    jq \
-    curl \
-  && /usr/bin/local/adoptium-install-jdk.sh
-
-ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
-
-# Generate smaller java runtime without unneeded files
-# for now we include the full module path to maintain compatibility
-# while still saving space (approx 200mb from the full distribution)
-RUN jlink \
-  --add-modules ALL-MODULE-PATH \
-  --strip-debug \
-  --no-man-pages \
-  --no-header-files \
-  --compress=2 \
-  --output /javaruntime
-
-FROM archlinux:base-20240929.0.266368
-
-ARG user=jenkins
-ARG group=jenkins
-ARG uid=1000
-ARG gid=1000
-
-RUN groupadd -g "${gid}" "${group}" \
-  && useradd -l -c "Jenkins user" -d /home/"${user}" -u "${uid}" -g "${gid}" -m "${user}"
-
-ARG AGENT_WORKDIR=/home/"${user}"/agent
-ENV TZ=Etc/UTC
-
-RUN pacman -Syu curl git git-lfs openssh tzdata --noconfirm
-
-ARG VERSION=3261.v9c670a_4748a_9
-ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" /usr/share/jenkins/agent.jar
-RUN chmod 0644 /usr/share/jenkins/agent.jar \
-  && ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar
-
-ENV JAVA_HOME=/opt/java/openjdk
-ENV PATH "${JAVA_HOME}/bin:${PATH}"
-COPY --from=jre-build /javaruntime "$JAVA_HOME"
-
-USER "${user}"
-ENV AGENT_WORKDIR="${AGENT_WORKDIR}"
-RUN mkdir /home/"${user}"/.jenkins && mkdir -p "${AGENT_WORKDIR}"
-
-VOLUME /home/"${user}"/.jenkins
-VOLUME "${AGENT_WORKDIR}"
-WORKDIR /home/"${user}"
-ENV USER=${user}
-LABEL \
-    org.opencontainers.image.vendor="Jenkins project" \
-    org.opencontainers.image.title="Official Jenkins Agent Base Docker image" \
-    org.opencontainers.image.description="This is a base image, which provides the Jenkins agent executable (agent.jar)" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://www.jenkins.io/" \
-    org.opencontainers.image.source="https://github.com/jenkinsci/docker-agent" \
-    org.opencontainers.image.licenses="MIT"
diff --git a/debian/Dockerfile b/debian/Dockerfile
index a32f9bbee..e6253158d 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -47,16 +47,14 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # while still saving space (approx 200mb from the full distribution)
 RUN if [[ "${TARGETPLATFORM}" != "linux/arm/v7" ]]; then \
     case "$(jlink --version 2>&1)" in \
-      # jlink version 11 has less features than JDK17+
-      "11."*) set -- "--strip-debug" "--compress=2" ;; \
-      "17."*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
+      "17."*) set -- "--compress=2" ;; \
       # the compression argument is different for JDK21
-      "21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
+      "21."*) set -- "--compress=zip-6" ;; \
       *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
     esac; \
     jlink \
+      --strip-java-debug-attributes \
       "$1" \
-      "$2" \
       --add-modules ALL-MODULE-PATH \
       --no-man-pages \
       --no-header-files \
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7a5a32858..8e711877c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,6 +1,5 @@
 group "linux" {
   targets = [
-    "agent_archlinux_jdk11",
     "alpine",
     "debian",
     "rhel_ubi9"
@@ -16,11 +15,8 @@ group "windows" {
 
 group "linux-agent-only" {
   targets = [
-    "agent_archlinux_jdk11",
-    "agent_alpine_jdk11",
     "agent_alpine_jdk17",
     "agent_alpine_jdk21",
-    "agent_debian_jdk11",
     "agent_debian_jdk17",
     "agent_debian_jdk21",
     "agent_rhel_ubi9_jdk17",
@@ -30,10 +26,8 @@ group "linux-agent-only" {
 
 group "linux-inbound-agent-only" {
   targets = [
-    "inbound-agent_alpine_jdk11",
     "inbound-agent_alpine_jdk17",
     "inbound-agent_alpine_jdk21",
-    "inbound-agent_debian_jdk11",
     "inbound-agent_debian_jdk17",
     "inbound-agent_debian_jdk21",
     "inbound-agent_rhel_ubi9_jdk17",
@@ -51,14 +45,12 @@ group "linux-arm64" {
 
 group "linux-arm32" {
   targets = [
-    "debian_jdk11",
     "debian_jdk17"
   ]
 }
 
 group "linux-s390x" {
   targets = [
-    "debian_jdk11",
     "debian_jdk21"
   ]
 }
@@ -75,17 +67,13 @@ variable "agent_types_to_build" {
 }
 
 variable "jdks_to_build" {
-  default = [11, 17, 21]
+  default = [17, 21]
 }
 
 variable "default_jdk" {
   default = 17
 }
 
-variable "JAVA11_VERSION" {
-  default = "11.0.24_8"
-}
-
 variable "JAVA17_VERSION" {
   default = "17.0.12_7"
 }
@@ -164,11 +152,9 @@ function "is_default_jdk" {
 # Return the complete Java version corresponding to the jdk passed as parameter
 function "javaversion" {
   params = [jdk]
-  result = (equal(11, jdk)
-    ? "${JAVA11_VERSION}"
-    : (equal(17, jdk)
+  result = (equal(17, jdk)
       ? "${JAVA17_VERSION}"
-  : "${JAVA21_VERSION}"))
+  : "${JAVA21_VERSION}")
 }
 
 ## Specific functions
@@ -183,11 +169,9 @@ function "alpine_platforms" {
 # Return an array of Debian platforms to use depending on the jdk passed as parameter
 function "debian_platforms" {
   params = [jdk]
-  result = (equal(11, jdk)
-    ? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7", "linux/s390x"]
-    : (equal(17, jdk)
+  result = (equal(17, jdk)
       ? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7"]
-  : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]))
+  : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])
 }
 
 # Return array of Windows version(s) to build
@@ -293,24 +277,6 @@ target "debian" {
   platforms = debian_platforms(jdk)
 }
 
-target "agent_archlinux_jdk11" {
-  dockerfile = "archlinux/Dockerfile"
-  context    = "."
-  args = {
-    JAVA_VERSION = JAVA11_VERSION
-    VERSION      = REMOTING_VERSION
-  }
-  tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${orgrepo("agent")}:${REMOTING_VERSION}-${BUILD_NUMBER}-archlinux" : "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${orgrepo("agent")}:${REMOTING_VERSION}-${BUILD_NUMBER}-archlinux-jdk11" : "",
-    "${REGISTRY}/${orgrepo("agent")}:archlinux",
-    "${REGISTRY}/${orgrepo("agent")}:latest-archlinux",
-    "${REGISTRY}/${orgrepo("agent")}:archlinux-jdk11",
-    "${REGISTRY}/${orgrepo("agent")}:latest-archlinux-jdk11",
-  ]
-  platforms = ["linux/amd64"]
-}
-
 target "rhel_ubi9" {
   matrix = {
     type = agent_types_to_build
diff --git a/rhel/ubi9/Dockerfile b/rhel/ubi9/Dockerfile
index 89474b0f7..7bce17483 100644
--- a/rhel/ubi9/Dockerfile
+++ b/rhel/ubi9/Dockerfile
@@ -24,16 +24,14 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # for now we include the full module path to maintain compatibility
 # while still saving space (approx 200mb from the full distribution)
 RUN case "$(jlink --version 2>&1)" in \
-      # jlink version 11 has less features than JDK17+
-      "11."*) set -- "--strip-debug" "--compress=2" ;; \
-      "17."*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
+      "17."*) set -- "--compress=2" ;; \
       # the compression argument is different for JDK21
-      "21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
+      "21."*) set -- "--compress=zip-6" ;; \
       *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
     esac; \
     jlink \
+      --strip-java-debug-attributes \
       "$1" \
-      "$2" \
       --add-modules ALL-MODULE-PATH \
       --no-man-pages \
       --no-header-files \
diff --git a/tests/tests_agent.bats b/tests/tests_agent.bats
index e239e33d0..5e4d41b8a 100755
--- a/tests/tests_agent.bats
+++ b/tests/tests_agent.bats
@@ -91,7 +91,7 @@ ARCH=${ARCH:-x86_64}
 @test "[${SUT_IMAGE}] use build args correctly" {
   cd "${BATS_TEST_DIRNAME}"/.. || false
 
-  local TEST_VERSION="3025.vf64a_a_3da_6b_55" # Older version, must work with JDK11 and JDK17 and should contain https://github.com/jenkinsci/remoting/pull/532
+  local TEST_VERSION="3025.vf64a_a_3da_6b_55" # Older version, must work with JDK17 and should contain https://github.com/jenkinsci/remoting/pull/532
   local TEST_USER="test-user"
   local TEST_GROUP="test-group"
   local TEST_UID=2000
@@ -172,4 +172,4 @@ ARCH=${ARCH:-x86_64}
 
 @test "[${SUT_IMAGE}] default user is exposed in the environment" {
   docker inspect --format '{{ .Config.Env }}' "${SUT_IMAGE}" | grep 'USER=jenkins'
-}
\ No newline at end of file
+}
diff --git a/updatecli/scripts/check-jdk.sh b/updatecli/scripts/check-jdk.sh
index b7942cc4e..746701f28 100644
--- a/updatecli/scripts/check-jdk.sh
+++ b/updatecli/scripts/check-jdk.sh
@@ -13,22 +13,10 @@ function get_jdk_download_url() {
   jdk_version="${1}"
   platform="${2}"
   case "${jdk_version}" in
-    8*)
-      ## JDK8 does not have the carret ('-') in their archive names
-      echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk${jdk_version}/OpenJDK8U-jdk_${platform}_hotspot_${jdk_version//-}";
-      return 0;;
-    11*)
-      ## JDK11 URLs have an underscore ('_') instead of a plus ('+') in their archive names
-      echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${jdk_version}/OpenJDK11U-jdk_${platform}_hotspot_${jdk_version//+/_}";
-      return 0;;
     17*)
       ## JDK17 URLs have an underscore ('_') instead of a plus ('+') in their archive names
       echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${jdk_version}/OpenJDK17U-jdk_${platform}_hotspot_${jdk_version//+/_}";
       return 0;;
-    19*)
-      ## JDK19 URLs have an underscore ('_') instead of a plus ('+') in their archive names
-      echo "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-${jdk_version}/OpenJDK19U-jdk_${platform}_hotspot_${jdk_version//+/_}";
-      return 0;;
     21*)
       ## JDK21 URLs have an underscore ('_') instead of a plus ('+') in their archive names
       echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${jdk_version}/OpenJDK21U-jdk_${platform}_hotspot_${jdk_version//+/_}";
@@ -40,15 +28,8 @@ function get_jdk_download_url() {
 }
 
 case "${1}" in
-  8u*)
-    # No s390x support for JDK8: $platforms is kept as default
-    platforms=("x64_linux" "x64_windows" "aarch64_linux");;
-  11.*)
-    platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");;
   17.*+*)
     platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");;
-  19.*+*)
-    platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");;
   21*+*)
     platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");;
   *)
diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml
deleted file mode 100644
index 3baadee4c..000000000
--- a/updatecli/updatecli.d/jdk11.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
----
-name: Bump JDK11 version
-
-scms:
-  default:
-    kind: github
-    spec:
-      user: "{{ .github.user }}"
-      email: "{{ .github.email }}"
-      owner: "{{ .github.owner }}"
-      repository: "{{ .github.repository }}"
-      token: "{{ requiredEnv .github.token }}"
-      username: "{{ .github.username }}"
-      branch: "{{ .github.branch }}"
-
-sources:
-  lastVersion:
-    kind: githubrelease
-    name: Get the latest Adoptium JDK11 version
-    spec:
-      owner: "adoptium"
-      repository: "temurin11-binaries"
-      token: "{{ requiredEnv .github.token }}"
-      username: "{{ .github.username }}"
-      versionfilter:
-        kind: regex
-        # jdk-11.0.12+7(https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.12%2B7) is OK
-        # jdk-11.0.16.1+1 (https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.16.1%2B1) is OK
-        pattern: {{ .temurin.version_pattern }}
-    transformers:
-      - trimprefix: "jdk-"
-      - replacer:
-          from: +
-          to: _
-
-conditions:
-  checkTemurinAlpineDockerImage:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-alpine" is available
-    transformers:
-      - addsuffix: "-jdk-alpine"
-    spec:
-      architecture: linux/amd64
-      image: eclipse-temurin
-  checkTemurinDebianDockerImages:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-jammy" is available
-    transformers:
-      - addsuffix: "-jdk-jammy"
-    spec:
-      architectures:
-        - linux/amd64
-        - linux/arm64
-        - linux/s390x
-        - linux/arm/v7
-      image: eclipse-temurin
-  checkTemurinNanoserver2019DockerImage:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-1809" is available
-    transformers:
-      - addsuffix: "-jdk-nanoserver-1809"
-    spec:
-      architecture: windows/amd64
-      image: eclipse-temurin
-  checkTemurinWindowsCore2019DockerImage:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-1809" is available
-    transformers:
-      - addsuffix: "-jdk-windowsservercore-1809"
-    spec:
-      architecture: windows/amd64
-      image: eclipse-temurin
-  checkTemurinNanoserver2022DockerImage:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-ltsc2022" is available
-    transformers:
-      - addsuffix: "-jdk-nanoserver-ltsc2022"
-    spec:
-      architecture: windows/amd64
-      image: eclipse-temurin
-  checkTemurinWindowsCore2022DockerImage:
-    kind: dockerimage
-    name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-ltsc2022" is available
-    transformers:
-      - addsuffix: "-jdk-windowsservercore-ltsc2022"
-    spec:
-      architecture: windows/amd64
-      image: eclipse-temurin
-
-targets:
-  setJDK11VersionDockerBake:
-    name: "Bump JDK11 version for Linux images in the docker-bake.hcl file"
-    kind: hcl
-    spec:
-      file: docker-bake.hcl
-      path: variable.JAVA11_VERSION.default
-    scmid: default
-
-actions:
-  default:
-    kind: github/pullrequest
-    scmid: default
-    title: Bump JDK11 version to {{ source "lastVersion" }}
-    spec:
-      labels:
-        - dependencies
-        - jdk11
diff --git a/updatecli/updatecli.d/remoting.yaml b/updatecli/updatecli.d/remoting.yaml
index 50cb6de23..0cbe5f852 100644
--- a/updatecli/updatecli.d/remoting.yaml
+++ b/updatecli/updatecli.d/remoting.yaml
@@ -43,15 +43,6 @@ targets:
         keyword: ARG
         matcher: VERSION
     scmid: default
-  setArchlinuxDockerImage:
-    name: Bump the Jenkins remoting version on Archlinux
-    kind: dockerfile
-    spec:
-      file: archlinux/Dockerfile
-      instruction:
-        keyword: ARG
-        matcher: VERSION
-    scmid: default
   setDebianDockerImage:
     name: Bump the Jenkins remoting version on Debian Bullseye
     kind: dockerfile
diff --git a/updatecli/values.github-action.yaml b/updatecli/values.github-action.yaml
index ce1d10b36..bff44d66f 100644
--- a/updatecli/values.github-action.yaml
+++ b/updatecli/values.github-action.yaml
@@ -7,4 +7,4 @@ github:
   owner: "jenkinsci"
   repository: "docker-agent"
 temurin:
-  version_pattern: "^jdk-[11|17|21].(\\d*).(\\d*).(\\d*)(.(\\d*))\\+(\\d*)?$"
+  version_pattern: "^jdk-[17|21].(\\d*).(\\d*).(\\d*)(.(\\d*))\\+(\\d*)?$"