diff --git a/pipelines/jobs/configurations/jdk11u_evaluation.groovy b/pipelines/jobs/configurations/jdk11u_evaluation.groovy
index 3b850339b..de1db1154 100644
--- a/pipelines/jobs/configurations/jdk11u_evaluation.groovy
+++ b/pipelines/jobs/configurations/jdk11u_evaluation.groovy
@@ -2,6 +2,9 @@
 targetConfigurations = [
         'aarch64Windows': [
                 'temurin'
+        ],
+        'riscv64Linux': [
+                'temurin'
         ]
         // 'x64Mac'        : [
         //         'openj9'
@@ -33,10 +36,10 @@ targetConfigurations = [
         // ]
 ]
 
-// if set to empty string then it wont get triggered
-triggerSchedule_evaluation = ''
-// if set to empty string then it wont get triggered
-triggerSchedule_weekly_evaluation= ''
+// 11:30 Tue, Thu
+triggerSchedule_evaluation = 'TZ=UTC\n30 11 * * 2,4'
+// 23:05 Sun
+triggerSchedule_weekly_evaluation = 'TZ=UTC\n05 23 * * 7'
 
 // scmReferences to use for weekly evaluation build
 weekly_evaluation_scmReferences = [
diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 6b14e7935..bddddb542 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -180,27 +180,40 @@ class Config11 {
 
         riscv64Linux      :  [
                 os                   : 'linux',
+                arch                 : 'riscv64',
                 dockerImage          : [
+                        'hotspot'    : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
                         'openj9'     : 'adoptopenjdk/centos6_build_image',
                         'bisheng'    : 'adoptopenjdk/centos6_build_image'
                 ],
-                arch                 : 'riscv64',
+                dockerArgs           : [
+                        'hotspot'    : '--platform linux/riscv64'
+                ],
                 crossCompile         : [
+                        'hotspot'    : 'dockerhost-rise-ubuntu2204-aarch64-1'
                         'openj9'     : 'x64',
                         'bisheng'    : 'x64'
                 ],
                 buildArgs            : [
+                        'hotspot'    : '--create-sbom',
                         'openj9'     : '--cross-compile',
-                        'bisheng'    : '--cross-compile --branch risc-v',
-                        'temurin'    : '--create-sbom'
+                        'bisheng'    : '--cross-compile --branch risc-v'
                 ],
                 configureArgs        : [
+                        'hotspot'    : '--enable-headless-only=yes --enable-dtrace',
                         'openj9'     : '--disable-ddr --openjdk-target=riscv64-unknown-linux-gnu --with-sysroot=/opt/fedora28_riscv_root',
                         'bisheng'    : '--openjdk-target=riscv64-unknown-linux-gnu --with-sysroot=/opt/fedora28_riscv_root --with-jvm-features=shenandoahgc'
                 ],
                 test                : [
-                        nightly: ['sanity.openjdk'],
-                        weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
+                        'hotspot'   : 'default',
+                        'openj9'    : [
+                                nightly: ['sanity.openjdk'],
+                                weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
+                        ],
+                        'bisheng'   : [
+                                nightly: ['sanity.openjdk'],
+                                weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
+                        ]
                 ],
         ],