diff --git a/gradle.properties b/gradle.properties
index 4236519ba..85d55446f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Allow for OWASP dependency check gradle task, which is going OOM
-org.gradle.jvmargs=-Xmx4096m
+# Flags to improve build performance
+org.gradle.configureondemand=true