diff --git a/buildenv/jenkins/omrbuild.groovy b/buildenv/jenkins/omrbuild.groovy
index 354c0747923..55c11629c7a 100644
--- a/buildenv/jenkins/omrbuild.groovy
+++ b/buildenv/jenkins/omrbuild.groovy
@@ -161,7 +161,7 @@ SPECS = [
         'junitPublish' : true
     ],
     'linux_riscv64_cross' : [
-        'alias': 'riscv',
+        'alias': 'riscv_cross',
         'label' : 'compile:riscv64:cross',
         'reference' : defaultReference,
         'environment' : [
@@ -180,6 +180,32 @@ SPECS = [
         'testArgs' : '',
         'junitPublish' : true
     ],
+    'linux_riscv64' : [
+        'alias': 'riscv',
+        'label' : 'hw.arch.riscv64',
+        'reference' : defaultReference,
+        'environment' : [
+            'PATH+CCACHE=/usr/lib/ccache/',
+            /*
+             * As of now, native RISC-V build agents are running as a Docker containers
+             * so we need to set OMR_RUNNING_IN_DOCKER even though the build itself does not
+             * use Docker. Otherwise sysinfo_is_running_in_container would fail.
+             */
+            'OMR_RUNNING_IN_DOCKER=1'
+        ],
+        'ccache' : true,
+        'buildSystem' : 'cmake',
+        'builds' : [
+            [
+                'buildDir' : cmakeBuildDir,
+                'configureArgs' : '-Wdev -C../cmake/caches/Travis.cmake',
+                'compile' : defaultCompile
+            ]
+        ],
+        'test' : true,
+        'testArgs' : '',
+        'junitPublish' : true
+    ],
     'linux_x86' : [
         'alias': 'x32linux',
         'label' : 'compile:xlinux',