diff --git a/toolchains.xml b/toolchains.xml
index 15fc236d91b..b5ee19aca06 100644
--- a/toolchains.xml
+++ b/toolchains.xml
@@ -12,7 +12,7 @@
             <vendor>sun</vendor>
       </provides>
       <configuration>
-            <jdkHome>/opt/jdk1.8.0_20/jre</jdkHome>
+            <jdkHome>/opt/sapjvm_8/jre</jdkHome>
       </configuration>
   </toolchain>
 </toolchains>
diff --git a/wiki/howto/development/ci.md b/wiki/howto/development/ci.md
index 6b96fa16e1a..47001005984 100644
--- a/wiki/howto/development/ci.md
+++ b/wiki/howto/development/ci.md
@@ -113,6 +113,8 @@ The image has been crafted specifically to contain the tools required for the bu
    # ensure the host key of sapsailing.com is accepted:
    sudo -u sailing ssh -o StrictHostKeyChecking=false trac@sapsailing.com ls >/dev/null
    sudo -u sailing git clone trac@sapsailing.com:/home/trac/git /home/sailing/code
+   sudo -u hudson mkdir ~/.m2
+   sudo -u hudson cp /home/sailing/code/toolchains.xml /home/hudson/.m2
    sudo -u hudson ssh -o StrictHostKeyChecking=false trac@sapsailing.com ls >/dev/null
    echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6TjveiR+KkEbQQcAEcme6PCUHZLLU5ENRCXnXKaFolWrBj77xEMf3RrlLJ1TINepuwydHDtN5of0D1kjykAIlgZPeMYf9zq3mx0dQk/B2IEFSW8Mbj74mYDpQoUULwosSmWz3yAhfLRgE83C7Wvdb0ToBGVHeHba2IFsupnxU6gcInz8SfX3lP78mh4KzVkNmQdXkfEC2Qe/HUeDLdI8gqVtAOd0NKY8yv/LUf4JX8wlZb6rU9Y4nWDGbgcv/k8h67xYRI4YbtEDVkPBqCZux66JuwKF4uZ2q+rPZTYRYJWT8/0x1jz5W5DQtuDVITT1jb1YsriegOZgp9LfS11B7w== hudson@ip-172-31-28-17" >/home/hudson/.ssh/authorized_keys
    sudo -u hudson wget -O /home/hudson/slave.jar "https://hudson.sapsailing.com/jnlpJars/slave.jar"