diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0f4d0f3789..d93d632517 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -12,8 +12,9 @@ RUN mkdir -p /usr/lib/android-sdk/cmdline-tools/
 RUN cd /tmp/ && mv cmdline-tools/ latest/ && mv latest/ /usr/lib/android-sdk/cmdline-tools/
 RUN mkdir /usr/lib/android-sdk/licenses/
 RUN chmod -R 755 /usr/lib/android-sdk/
-RUN mkdir -p $HOME/.gradle
-RUN echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
-RUN echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
-RUN echo "org.gradle.parallel=true" >> $HOME/.gradle/gradle.properties
-RUN echo "org.gradle.configureondemand=true" >> $HOME/.gradle/gradle.properties
\ No newline at end of file
+RUN mkdir -p $HOME/.gradle && \
+    echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.caching=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.parallel=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.configureondemand=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
\ No newline at end of file
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 889cad0974..be6ad691dc 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -61,8 +61,9 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: |
                     mkdir -p "$HOME/.gradle"
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
+                    echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
                     echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.parallel=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.configureondemand=true" >> $HOME/.gradle/gradle.properties
+                    echo "kapt.incremental.apt=true" >> $HOME/.gradle/gradle.properties
                     scripts/analysis/analysis-wrapper.sh ${{ steps.get-vars.outputs.branch }} ${{ secrets.LOG_USERNAME }} ${{ secrets.LOG_PASSWORD }} "$GITHUB_RUN_NUMBER" ${{ steps.get-vars.outputs.pr }}
diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml
index 1a83b17f56..b57bb719c8 100644
--- a/.github/workflows/assembleFlavors.yml
+++ b/.github/workflows/assembleFlavors.yml
@@ -30,8 +30,9 @@ jobs:
                     java-version: 17
             -   name: Build ${{ matrix.flavor }}
                 run: |
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" >> gradle.properties
+                    echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" >> gradle.properties
                     echo "org.gradle.caching=true" >> gradle.properties
                     echo "org.gradle.parallel=true" >> gradle.properties
                     echo "org.gradle.configureondemand=true" >> gradle.properties
+                    echo "kapt.incremental.apt=true" >> gradle.properties
                     ./gradlew assemble${{ matrix.flavor }}
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index b2fcfaebaf..00e2287e59 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -41,10 +41,11 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: |
                     mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
+                    echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
                     echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.parallel=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.configureondemand=true" >> $HOME/.gradle/gradle.properties
+                    echo "kapt.incremental.apt=true" >> $HOME/.gradle/gradle.properties
                     sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" app/build.gradle
                     sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" app/build.gradle
                     ./gradlew assembleQaDebug
diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml
index 07c95a244f..ee427d688a 100644
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@@ -69,10 +69,11 @@ jobs:
             -   name: Configure gradle daemon
                 run: |
                     mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
+                    echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
                     echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.parallel=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.configureondemand=true" >> $HOME/.gradle/gradle.properties
+                    echo "kapt.incremental.apt=true" >> $HOME/.gradle/gradle.properties
 
             -   name: Build gplay
                 run: ./gradlew assembleGplayDebug