diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ea9e1ab9d..fe9f6fca23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,8 +4,8 @@ jobs:
     docker:
       - image: cloudpipelines/pipeline-base
     environment:
-      JAVA_TOOL_OPTIONS: "-Xms64m -Xmx300m"
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms64m -Xmx300m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
+      JAVA_TOOL_OPTIONS: "-Xms64m -Xmx250m"
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms64m -Xmx250m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
       TERM: dumb
     branches:
       ignore:
diff --git a/samples/src/it/settings.xml b/samples/src/it/settings.xml
index 5329c60576..10eb7f523b 100644
--- a/samples/src/it/settings.xml
+++ b/samples/src/it/settings.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
 	<profiles>
+		<profile>
+			<id>CI</id>
+			<activation>
+				<property>
+					<name>env.CI</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.6.0</version>
+						<executions>
+							<execution>
+								<id>kill-daemons</id>
+								<phase>clean</phase>
+								<configuration>
+									<executable>pkill</executable>
+									<arguments>
+										<argument>-f</argument>
+										<argument>'.*GradleDaemon.*'</argument>
+									</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>integration</id>
 			<activation>
diff --git a/scripts/fastBuild.sh b/scripts/fastBuild.sh
index 4251e19220..5acf714f02 100755
--- a/scripts/fastBuild.sh
+++ b/scripts/fastBuild.sh
@@ -7,4 +7,4 @@ set -e
 [[ -z "${CORES}" ]] && CORES=1
 echo -e "\n\nRUNNING FAST BUILD (NO INTEGRATION TESTS) WITH [${CORES}] CORES\n\n"
 
-./mvnw clean install -Pdocs,fast -T ${CORES}
\ No newline at end of file
+./mvnw clean install -Pdocs,fast -T ${CORES} -Dinvoker.parallelThreads=${CORES}
\ No newline at end of file