diff --git a/gradlew b/gradlew
index 2eab56ca99..fefa5b9647 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,8 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
+DEFAULT_JVM_OPTS="-Xmx2048M -XX:MaxPermSize=512M"
+export GRADLE_OPTS='-Dorg.gradle.daemon=false'
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
diff --git a/gradlew.bat b/gradlew.bat
index afa247ed4e..85b6e6ac73 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -10,6 +10,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=-Xmx1024M
+set GRADLE_OPTS='-Dorg.gradle.daemon=false'
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.