diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10243f0b46..f2107b8a2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,6 +4,7 @@ jobs:
     docker:
       - image: springcloud/pipeline-base
     environment:
+      JAVA_TOOL_OPTIONS: "-Xms512m -Xmx512m"
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
       TERM: dumb
     branches:
diff --git a/guides/gs-contract-rest/test/run.sh b/guides/gs-contract-rest/test/run.sh
index d39e0d5f2d..704daf047c 100755
--- a/guides/gs-contract-rest/test/run.sh
+++ b/guides/gs-contract-rest/test/run.sh
@@ -2,6 +2,12 @@
 
 set -e
 
+GUIDES_MAVEN_SYSTEM_PROPERTIES="${GUIDES_MAVEN_SYSTEM_PROPERTIES:--Xms256m -Xmx256m}"
+GUIDES_GRADLE_SYSTEM_PROPERTIES="${GUIDES_GRADLE_SYSTEM_PROPERTIES:--Dorg.gradle.jvmargs="-Xmx256m -Xmx256m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false}"
+
+MAVEN_OPTS="${GUIDES_MAVEN_SYSTEM_PROPERTIES}"
+GRADLE_OPTS="${GUIDES_GRADLE_SYSTEM_PROPERTIES}"
+
 cd $(dirname $0)
 
 cd ../complete
diff --git a/guides/pom.xml b/guides/pom.xml
index c9d97b93cc..33d3c22eeb 100644
--- a/guides/pom.xml
+++ b/guides/pom.xml
@@ -37,7 +37,7 @@
 							 is available -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
-						<version>2.0.0</version>
+						<version>3.2.0</version>
 						<configuration>
 							<settingsFile>../samples/src/it/settings.xml</settingsFile>
 							<projectsDirectory>${project.basedir}</projectsDirectory>
diff --git a/samples/pom.xml b/samples/pom.xml
index 6a25ad501c..42841e2f4b 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -109,7 +109,7 @@
 							 is available -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
-						<version>2.0.0</version>
+						<version>3.2.0</version>
 						<configuration>
 							<settingsFile>src/it/settings.xml</settingsFile>
 							<projectsDirectory>standalone</projectsDirectory>