diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18f9d425811..33b792627b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,6 +190,12 @@ default:
     KUBERNETES_MEMORY_REQUEST: 20Gi
     KUBERNETES_MEMORY_LIMIT: 20Gi
 
+.tier_xl:
+  variables: &tier_xl_variables
+    <<: *tier_l_variables
+    KUBERNETES_MEMORY_REQUEST: 32Gi
+    KUBERNETES_MEMORY_LIMIT: 32Gi
+
 .gitlab_base_ref_params: &gitlab_base_ref_params
   - |
     export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh)
@@ -362,7 +368,7 @@ build:
 build_tests:
   extends: .gradle_build
   variables:
-    <<: *tier_l_variables
+    <<: *tier_xl_variables
     BUILD_CACHE_POLICY: push
     DEPENDENCY_CACHE_POLICY: pull
   parallel:
diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
index df5530e2a9c..67a11a1fcf9 100644
--- a/gradle/java_no_deps.gradle
+++ b/gradle/java_no_deps.gradle
@@ -270,21 +270,22 @@ tasks.withType(Test).configureEach {
 }
 
 
-[JavaCompile, ScalaCompile, GroovyCompile].each {
-  type ->
-  tasks.withType(type).configureEach {
-    if (options.fork) {
-      options.forkOptions.with {
-        memoryMaximumSize = "256M"
-      }
-    }
-  }
+tasks.withType(JavaCompile).configureEach {
+  options.forkOptions.memoryMaximumSize = "256M"
+}
+
+tasks.withType(GroovyCompile).configureEach {
+  it.options.forkOptions.memoryMaximumSize = "256M"
+}
+
+tasks.withType(ScalaCompile).configureEach {
+  options.forkOptions.memoryMaximumSize = "256M"
 }
 
-if (project.plugins.hasPlugin('kotlin')) {
+project.pluginManager.withPlugin('kotlin') {
   ['compileKotlin', 'compileTestKotlin'].each {
-    type ->
-    tasks.named(type) {
+    name ->
+    tasks.named(name) {
       kotlinDaemonJvmArguments = ["-Xmx256m", "-XX:+UseParallelGC"]
     }
   }