diff --git a/pipelines/jobs/configurations/jdk21u.groovy b/pipelines/jobs/configurations/jdk21u.groovy
index 2afd83a5d..e958368ff 100644
--- a/pipelines/jobs/configurations/jdk21u.groovy
+++ b/pipelines/jobs/configurations/jdk21u.groovy
@@ -29,6 +29,9 @@ targetConfigurations = [
         ],
         'aarch64Mac': [
                 'temurin'
+        ],
+        'riscv64Linux': [
+                'temurin'
         ]
 ]
 
diff --git a/pipelines/jobs/configurations/jdk21u_evaluation.groovy b/pipelines/jobs/configurations/jdk21u_evaluation.groovy
index d43e4a1e7..5f821a598 100644
--- a/pipelines/jobs/configurations/jdk21u_evaluation.groovy
+++ b/pipelines/jobs/configurations/jdk21u_evaluation.groovy
@@ -1,7 +1,4 @@
 targetConfigurations = [
-        'riscv64Linux': [
-                'temurin'
-        ],
         'aarch64Windows' : [
                 'temurin'
         ]
diff --git a/pipelines/jobs/configurations/jdk21u_release.groovy b/pipelines/jobs/configurations/jdk21u_release.groovy
index be136a671..a0130bbbf 100644
--- a/pipelines/jobs/configurations/jdk21u_release.groovy
+++ b/pipelines/jobs/configurations/jdk21u_release.groovy
@@ -28,6 +28,9 @@ targetConfigurations = [
         ],
         'aarch64Mac': [
                 'temurin'
+        ],
+        'riscv64Linux': [
+                'temurin'
         ]
 ]