diff --git a/Dockerfile b/Dockerfile
index 9c7cd6aa9f..4fa62fd751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,16 +27,10 @@ RUN mkdir -p $ANDROID_HOME/cmdline-tools/latest && \
     yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses && \
     $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-31" "platforms;android-34" "build-tools;34.0.0"
 
-# aapt2 requires libs that are not provided in arm64 ubuntu image
-RUN  mkdir                                          /lib/x86_64-linux-gnu
-COPY ci_resources/x86_64_libs/libc.so.6             /lib/x86_64-linux-gnu/libc.so.6
-COPY ci_resources/x86_64_libs/libdl.so.2            /lib/x86_64-linux-gnu/libdl.so.2
-COPY ci_resources/x86_64_libs/libgcc_s.so.1         /lib/x86_64-linux-gnu/libgcc_s.so.1
-COPY ci_resources/x86_64_libs/libm.so.6             /lib/x86_64-linux-gnu/libm.so.6
-COPY ci_resources/x86_64_libs/libpthread.so.0       /lib/x86_64-linux-gnu/libpthread.so.0
-COPY ci_resources/x86_64_libs/librt.so.1            /lib/x86_64-linux-gnu/librt.so.1
-RUN  mkdir                                          /lib64
-COPY ci_resources/x86_64_libs/ld-linux-x86-64.so.2  /lib64/ld-linux-x86-64.so.2
+RUN wget https://github.com/lzhiyong/android-sdk-tools/releases/download/34.0.3/android-sdk-tools-static-aarch64.zip -O /tmp/android-sdk-tools-static-aarch64.zip && \
+    unzip /tmp/android-sdk-tools-static-aarch64.zip -d /tmp/android-sdk-tools-static-arm && \
+    cp -r /tmp/android-sdk-tools-static-arm/build-tools/* $ANDROID_HOME/build-tools/34.0.0/ && \
+    rm -rf /tmp/android-sdk-tools-static-arm /tmp/android-sdk-tools-static-aarch64.zip
 
 RUN gem install bundler:2.5.23
 RUN gem install fastlane -v 2.211.0 -N -V
diff --git a/ci_resources/8gb_ram_ci_gradle.properties b/ci_resources/8gb_ram_ci_gradle.properties
deleted file mode 100644
index 05b91953ed..0000000000
--- a/ci_resources/8gb_ram_ci_gradle.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC -XX:ParallelGCThreads=3 -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.parallel=true
-org.gradle.workers.max=3
-org.gradle.daemon=false
-org.gradle.unsafe.configuration-cache=false
-org.gradle.console=plain
-org.gradle.caching=false
-
-android.useAndroidX=true
-android.nonTransitiveRClass=false
-
-kotlin.incremental=false
diff --git a/ci_resources/build_8gb_ram_ci_gradle.properties b/ci_resources/build_8gb_ram_ci_gradle.properties
index 2a015194e2..45c763f199 100644
--- a/ci_resources/build_8gb_ram_ci_gradle.properties
+++ b/ci_resources/build_8gb_ram_ci_gradle.properties
@@ -8,6 +8,7 @@ org.gradle.caching=false
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false
+android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2
 
 kotlin.incremental=false
 kotlin.compiler.execution.strategy=in-process
\ No newline at end of file
diff --git a/ci_resources/tests_8gb_ram_ci_gradle.properties b/ci_resources/tests_8gb_ram_ci_gradle.properties
index 05b91953ed..78577a0975 100644
--- a/ci_resources/tests_8gb_ram_ci_gradle.properties
+++ b/ci_resources/tests_8gb_ram_ci_gradle.properties
@@ -8,5 +8,6 @@ org.gradle.caching=false
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false
+android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2
 
 kotlin.incremental=false