diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml
index 43928b7a9..1e06125fe 100644
--- a/updatecli/updatecli.d/jdk21.yaml
+++ b/updatecli/updatecli.d/jdk21.yaml
@@ -27,13 +27,8 @@ sources:
     name: Get the latest Adoptium JDK21 version
     kind: gittag
     scmid: temurin21-binaries
-    spec:
-      versionfilter:
-        kind: regex
-        pattern: ".*-ea-.*"
     transformers:
       - trimprefix: "jdk-"
-      - trimsuffix: "-ea-beta"
 
 conditions:
   checkIfReleaseIsAvailable:
@@ -49,7 +44,10 @@ targets:
       file: docker-bake.hcl
       path: variable.JAVA21_VERSION.default
     scmid: default
-
+    transformers:
+      - replacers:
+          - from: "+"
+            to: "_"
 actions:
   default:
     kind: github/pullrequest