diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 6d8a3319c..67aea0631 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -188,11 +188,7 @@ class Config11 {
                         'openj9'     : 'adoptopenjdk/centos6_build_image',
                         'bisheng'    : 'adoptopenjdk/centos6_build_image'
                 ],
-                dockerArgs           : [
-                        'temurin'    : '--platform linux/riscv64'
-                ],
                 crossCompile         : [
-                        'temurin'    : 'dockerhost-rise-ubuntu2204-aarch64-1',
                         'openj9'     : 'x64',
                         'bisheng'    : 'x64'
                 ],
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index 8294531b9..f8dafe80d 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -177,9 +177,7 @@ class Config17 {
         riscv64Linux      :  [
                 os                  : 'linux',
                 arch                : 'riscv64',
-                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
index 8c1b1af18..ee5efc8d6 100644
--- a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
@@ -157,9 +157,7 @@ class Config19 {
         riscv64Linux      :  [
                 os                   : 'linux',
                 arch                 : 'riscv64',
-                crossCompile         : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage          : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs           : '--platform linux/riscv64',
                 configureArgs        : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
index 6f8e609e1..62b39858e 100644
--- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -146,9 +146,7 @@ class Config20 {
         riscv64Linux      :  [
                 os                  : 'linux',
                 arch                : 'riscv64',
-                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
index b9186225e..d078b0630 100644
--- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -158,9 +158,7 @@ class Config21 {
         riscv64Linux      :  [
                 os                  : 'linux',
                 arch                : 'riscv64',
-                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
index 1128ed540..fc040d309 100644
--- a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -135,9 +135,7 @@ class Config22 {
         riscv64Linux      :  [
                 os                  : 'linux',
                 arch                : 'riscv64',
-                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
index 1feb2225e..18c82c0ce 100644
--- a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
@@ -135,9 +135,7 @@ class Config23 {
         riscv64Linux      :  [
                 os                  : 'linux',
                 arch                : 'riscv64',
-                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
                 dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
-                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [