diff --git a/jenkins/pipelines/cdt/cdt-10.0-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.0-standalone-debugger.Jenkinsfile
index 5e66ac0..1a01aff 100644
--- a/jenkins/pipelines/cdt/cdt-10.0-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.0-standalone-debugger.Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.0.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.0.Jenkinsfile
index 1c0d4ab..134c804 100644
--- a/jenkins/pipelines/cdt/cdt-10.0.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.0.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.1-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.1-standalone-debugger.Jenkinsfile
index 0b3cf18..14f43e4 100644
--- a/jenkins/pipelines/cdt/cdt-10.1-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.1-standalone-debugger.Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.1.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.1.Jenkinsfile
index 38d9f5f..32dab24 100644
--- a/jenkins/pipelines/cdt/cdt-10.1.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.1.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.2-java16.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.2-java16.Jenkinsfile
index 44475d3..3d16354 100644
--- a/jenkins/pipelines/cdt/cdt-10.2-java16.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.2-java16.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
                 sh 'tar xf OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz && JAVA_HOME=$PWD/jdk-16+36 PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
diff --git a/jenkins/pipelines/cdt/cdt-10.2.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.2.Jenkinsfile
index 21f4a0b..28c662b 100644
--- a/jenkins/pipelines/cdt/cdt-10.2.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.2.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.3.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.3.Jenkinsfile
index 8edd7b5..8308a89 100644
--- a/jenkins/pipelines/cdt/cdt-10.3.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.3.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.4.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.4.Jenkinsfile
index 9fc6396..af63d9f 100644
--- a/jenkins/pipelines/cdt/cdt-10.4.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.4.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.5.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.5.Jenkinsfile
index 2e527d6..f1ffbd2 100644
--- a/jenkins/pipelines/cdt/cdt-10.5.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.5.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-10.6.Jenkinsfile b/jenkins/pipelines/cdt/cdt-10.6.Jenkinsfile
index b5929e5..a8eb056 100644
--- a/jenkins/pipelines/cdt/cdt-10.6.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-10.6.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-9.10-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.10-standalone-debugger.Jenkinsfile
index 233cb79..ee50377 100644
--- a/jenkins/pipelines/cdt/cdt-9.10-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.10-standalone-debugger.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.10.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.10.Jenkinsfile
index dc2d5be..b453b13 100644
--- a/jenkins/pipelines/cdt/cdt-9.10.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.10.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh 'JAVA_HOME=$JAVA8_HOME PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.11-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.11-standalone-debugger.Jenkinsfile
index 4f99c6e..1f15044 100644
--- a/jenkins/pipelines/cdt/cdt-9.11-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.11-standalone-debugger.Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.11.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.11.Jenkinsfile
index e6d29d5..a4ab214 100644
--- a/jenkins/pipelines/cdt/cdt-9.11.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.11.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh 'JAVA_HOME=$JAVA8_HOME PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.7.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.7.Jenkinsfile
index 8707b16..8427056 100644
--- a/jenkins/pipelines/cdt/cdt-9.7.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.7.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh 'JAVA_HOME=$JAVA8_HOME PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.8-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.8-standalone-debugger.Jenkinsfile
index 5200e70..cb3d224 100644
--- a/jenkins/pipelines/cdt/cdt-9.8-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.8-standalone-debugger.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.8.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.8.Jenkinsfile
index a6ef885..5a7d4ff 100644
--- a/jenkins/pipelines/cdt/cdt-9.8.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.8.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh 'JAVA_HOME=$JAVA8_HOME PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.9-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.9-standalone-debugger.Jenkinsfile
index 46a7268..c2c6699 100644
--- a/jenkins/pipelines/cdt/cdt-9.9-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.9-standalone-debugger.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-9.9.Jenkinsfile b/jenkins/pipelines/cdt/cdt-9.9.Jenkinsfile
index d219165..0329b85 100644
--- a/jenkins/pipelines/cdt/cdt-9.9.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-9.9.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh 'JAVA_HOME=$JAVA8_HOME PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -P build-standalone-debugger-rcp \
diff --git a/jenkins/pipelines/cdt/cdt-master-java16.Jenkinsfile b/jenkins/pipelines/cdt/cdt-master-java16.Jenkinsfile
index 445fda6..794c937 100644
--- a/jenkins/pipelines/cdt/cdt-master-java16.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-master-java16.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
                 sh 'tar xf OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz && JAVA_HOME=$PWD/jdk-16+36 PATH=$JAVA_HOME/bin:$PATH /usr/share/maven/bin/mvn \
                       clean verify -B -V \
diff --git a/jenkins/pipelines/cdt/cdt-master-standalone-debugger.Jenkinsfile b/jenkins/pipelines/cdt/cdt-master-standalone-debugger.Jenkinsfile
index 02dec73..b35209a 100644
--- a/jenkins/pipelines/cdt/cdt-master-standalone-debugger.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-master-standalone-debugger.Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/cdt-master.Jenkinsfile b/jenkins/pipelines/cdt/cdt-master.Jenkinsfile
index 54477f9..74df33d 100644
--- a/jenkins/pipelines/cdt/cdt-master.Jenkinsfile
+++ b/jenkins/pipelines/cdt/cdt-master.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "ps -AHf"
                 sh "cat /etc/passwd | tail -1"
             }
@@ -39,7 +39,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
index b2aafcf..743bc21 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
@@ -45,7 +45,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "cd ${WORKSPACE}/eclipse-cdt && /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
index 988246b..3835460 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
@@ -45,7 +45,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "cd ${WORKSPACE}/eclipse-cdt && /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
index 85ec385..c4b90d9 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile
index 8f109b0..87b990f 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
diff --git a/jenkins/pipelines/cdt/verify/cdt-verify-combined-pipeline.Jenkinsfile b/jenkins/pipelines/cdt/verify/cdt-verify-combined-pipeline.Jenkinsfile
index 6df63c8..96a19ad 100644
--- a/jenkins/pipelines/cdt/verify/cdt-verify-combined-pipeline.Jenkinsfile
+++ b/jenkins/pipelines/cdt/verify/cdt-verify-combined-pipeline.Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
             container('cdt') {
               timeout(120) {
                 checkout([$class: 'GitSCM', branches: [[name: '**']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']]], submoduleCfg: [], userRemoteConfigs: [[refspec: '$GERRIT_REFSPEC', url: 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git']]])
-                withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+                withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                     sh '''/usr/share/maven/bin/mvn clean verify -V -B -DskipDoc=true \
 -Ddsf.gdb.tests.timeout.multiplier=50 \
 -Dindexer.timeout=500 \
@@ -58,7 +58,7 @@ pipeline {
             container('cdt') {
               timeout(120) {
                 checkout([$class: 'GitSCM', branches: [[name: '**']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']]], submoduleCfg: [], userRemoteConfigs: [[refspec: '$GERRIT_REFSPEC', url: 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git']]])
-                withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+                withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                     sh '''/usr/share/maven/bin/mvn clean verify -V -B -DskipDoc=true \
 -Ddsf.gdb.tests.timeout.multiplier=50 \
 -Dindexer.timeout=500 \
@@ -91,7 +91,7 @@ pipeline {
             container('cdt') {
               timeout(120) {
                 checkout([$class: 'GitSCM', branches: [[name: '**']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']]], submoduleCfg: [], userRemoteConfigs: [[refspec: '$GERRIT_REFSPEC', url: 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git']]])
-                withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+                withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                     sh '''/usr/share/maven/bin/mvn clean verify -B -V -DskipDoc=true \
 -Ddsf.gdb.tests.timeout.multiplier=50 \
 -Dindexer.timeout=500 \
diff --git a/jenkins/pipelines/cdt/verify/cdt-verify-terminal-only-pipeline.Jenkinsfile b/jenkins/pipelines/cdt/verify/cdt-verify-terminal-only-pipeline.Jenkinsfile
index 3be3c20..b7a23a8 100644
--- a/jenkins/pipelines/cdt/verify/cdt-verify-terminal-only-pipeline.Jenkinsfile
+++ b/jenkins/pipelines/cdt/verify/cdt-verify-terminal-only-pipeline.Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-other-pipeline.Jenkinsfile b/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-other-pipeline.Jenkinsfile
index 52f0c60..45c85fe 100644
--- a/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-other-pipeline.Jenkinsfile
+++ b/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-other-pipeline.Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-ui-only-pipeline.Jenkinsfile b/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-ui-only-pipeline.Jenkinsfile
index ed9da9c..eefdfb1 100644
--- a/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-ui-only-pipeline.Jenkinsfile
+++ b/jenkins/pipelines/cdt/verify/cdt-verify-test-cdt-ui-only-pipeline.Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/cdt/verify/cdt-verify-test-dsf-gdb-only-pipeline.Jenkinsfile b/jenkins/pipelines/cdt/verify/cdt-verify-test-dsf-gdb-only-pipeline.Jenkinsfile
index f094ef6..f973529 100644
--- a/jenkins/pipelines/cdt/verify/cdt-verify-test-dsf-gdb-only-pipeline.Jenkinsfile
+++ b/jenkins/pipelines/cdt/verify/cdt-verify-test-dsf-gdb-only-pipeline.Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Dmaven.test.failure.ignore=true \
diff --git a/jenkins/pipelines/releng/cdt-check-maven-plugin-updates.Jenkinsfile b/jenkins/pipelines/releng/cdt-check-maven-plugin-updates.Jenkinsfile
index 866791d..39133c8 100644
--- a/jenkins/pipelines/releng/cdt-check-maven-plugin-updates.Jenkinsfile
+++ b/jenkins/pipelines/releng/cdt-check-maven-plugin-updates.Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       steps {
         container('cdt') {
           timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+            withEnv(['MAVEN_OPTS=-XX:MaxRAMPercentage=60.0']) {
               sh 'MVN="/usr/share/maven/bin/mvn -Dmaven.repo.local=/home/jenkins/.m2/repository \
                       --settings /home/jenkins/.m2/settings.xml" ./releng/scripts/check_mvn_plugin_versions.sh'
             }