diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03807dc..f8a7956 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ build-android:
         - $HOME/go
   script: |
     export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version"
-    bash ./setup-ndk.sh && source ./android.env
+    bash ./setup-ndk.sh
     bin/update && bin/apply-ci && cd works/core
     git submodule update --init --recursive
     git tag v$version -f
@@ -23,7 +23,7 @@ build-android:
     cp *.aar clients/android/app/libs
     cd clients/android
     echo "Gonna build with ANDROID_HOME=$ANDROID_HOME"
-    ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease
+    ANDROID_HOME="$HOME/Android/Sdk" ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease
     cd ../..
     mkdir -p dist # prepare upload
     cp clients/android/app/build/outputs/apk/other/release/*.apk dist
diff --git a/setup-ndk.sh b/setup-ndk.sh
index 93ff03c..59b793c 100644
--- a/setup-ndk.sh
+++ b/setup-ndk.sh
@@ -21,10 +21,4 @@ sdkmanager \
   "build-tools;34.0.0" \
   "ndk;28.0.12433566"
 
-export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
-
-echo "
-ANDROID_HOME=$ANDROID_HOME
-ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
-ANDROID_NDK_HOME=$ANDROID_NDK_HOME
-" > android.env
\ No newline at end of file
+export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
\ No newline at end of file