diff --git a/instances/eclipse.platform.releng/jenkins/configuration.yml b/instances/eclipse.platform.releng/jenkins/configuration.yml
index 7e8351607..9738a5776 100644
--- a/instances/eclipse.platform.releng/jenkins/configuration.yml
+++ b/instances/eclipse.platform.releng/jenkins/configuration.yml
@@ -249,7 +249,7 @@ jenkins:
             key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
   - permanent:
       name: "riscv-build1"
-      nodeDescription: "4-core 8Gb riscv machine hosted by EF"
+      nodeDescription: "Scaleway hosted https://labs.scaleway.com/en/em-rv1/"
       labelString: "hw.arch.riscv64 riscv64 swt.natives-gtk.linux.riscv64 native.builder-gtk.linux.riscv64"
       remoteFS: '/home/jenkins'
       numExecutors: 1
@@ -257,7 +257,7 @@ jenkins:
       retentionStrategy: "always"
       launcher:
         ssh:
-          host: "172.30.206.102"
+          host: "62.210.163.101"
           port: "2022"
           credentialsId: "jenkins-riscv-ssh"
           prefixStartSlaveCmd: "ulimit -c 0 && "
@@ -265,5 +265,5 @@ jenkins:
           jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
           sshHostKeyVerificationStrategy:
             manuallyProvidedKeyVerificationStrategy:
-              key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkyLXj92rxKybYq6KuI8SpU7v5gGTWA3t/dMkHD1X1/"
+              key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG9E2uspGY1szNEq6Cl0nR6Gpa+1NpixcQzGLV7b2CF"
 
diff --git a/instances/eclipse.platform.releng/target/jenkins/configuration.yml b/instances/eclipse.platform.releng/target/jenkins/configuration.yml
index 8a4737bb7..9ff98b667 100644
--- a/instances/eclipse.platform.releng/target/jenkins/configuration.yml
+++ b/instances/eclipse.platform.releng/target/jenkins/configuration.yml
@@ -645,7 +645,7 @@ jenkins:
                   key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
     - permanent:
         name: "riscv-build1"
-        nodeDescription: "4-core 8Gb riscv machine hosted by EF"
+        nodeDescription: "Scaleway hosted https://labs.scaleway.com/en/em-rv1/"
         labelString: "hw.arch.riscv64 riscv64 swt.natives-gtk.linux.riscv64 native.builder-gtk.linux.riscv64"
         remoteFS: '/home/jenkins'
         numExecutors: 1
@@ -653,7 +653,7 @@ jenkins:
         retentionStrategy: "always"
         launcher:
           ssh:
-            host: "172.30.206.102"
+            host: "62.210.163.101"
             port: "2022"
             credentialsId: "jenkins-riscv-ssh"
             prefixStartSlaveCmd: "ulimit -c 0 && "
@@ -661,7 +661,7 @@ jenkins:
             jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
             sshHostKeyVerificationStrategy:
               manuallyProvidedKeyVerificationStrategy:
-                key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkyLXj92rxKybYq6KuI8SpU7v5gGTWA3t/dMkHD1X1/"
+                key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG9E2uspGY1szNEq6Cl0nR6Gpa+1NpixcQzGLV7b2CF"
 security:
   apiToken:
     creationOfLegacyTokenEnabled: false
diff --git a/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml b/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml
index 2cd012462..7e1afbcb9 100644
--- a/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml
+++ b/instances/eclipse.platform.releng/target/k8s/configmap-jenkins-config.yml
@@ -668,7 +668,7 @@ data:
                       key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
         - permanent:
             name: "riscv-build1"
-            nodeDescription: "4-core 8Gb riscv machine hosted by EF"
+            nodeDescription: "Scaleway hosted https://labs.scaleway.com/en/em-rv1/"
             labelString: "hw.arch.riscv64 riscv64 swt.natives-gtk.linux.riscv64 native.builder-gtk.linux.riscv64"
             remoteFS: '/home/jenkins'
             numExecutors: 1
@@ -676,7 +676,7 @@ data:
             retentionStrategy: "always"
             launcher:
               ssh:
-                host: "172.30.206.102"
+                host: "62.210.163.101"
                 port: "2022"
                 credentialsId: "jenkins-riscv-ssh"
                 prefixStartSlaveCmd: "ulimit -c 0 && "
@@ -684,7 +684,7 @@ data:
                 jvmOptions: "-XX:-HeapDumpOnOutOfMemoryError -XX:-CreateCoredumpOnCrash"
                 sshHostKeyVerificationStrategy:
                   manuallyProvidedKeyVerificationStrategy:
-                    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkyLXj92rxKybYq6KuI8SpU7v5gGTWA3t/dMkHD1X1/"
+                    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG9E2uspGY1szNEq6Cl0nR6Gpa+1NpixcQzGLV7b2CF"
     security:
       apiToken:
         creationOfLegacyTokenEnabled: false