diff --git a/build.gradle b/build.gradle
index 44b7a1954a..b5f0cb1ada 100644
--- a/build.gradle
+++ b/build.gradle
@@ -199,7 +199,6 @@ allprojects{
         sourceCompatibility = JavaVersion.VERSION_16
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
-        options.fork = true
         dependsOn clearCache
 
         options.forkOptions.jvmArgs += [
diff --git a/gradle.properties b/gradle.properties
index ddfe321771..a8c970fa3d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,12 @@
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms256m -Xmx1024m --illegal-access=permit
+org.gradle.jvmargs=-Xms256m -Xmx1024m \
+--add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED  \
+--add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
 # Multithreaded
 kapt.use.worker.api=true
 # Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20)