diff --git a/metadata/is.xyz.vcmi.yml b/metadata/is.xyz.vcmi.yml
index 04432b0d66..8cfa66e106 100644
--- a/metadata/is.xyz.vcmi.yml
+++ b/metadata/is.xyz.vcmi.yml
@@ -710,16 +710,17 @@ Builds:
       - make
       - popd
       - pip install $$conan$$
+      - cd ../..
       - export CONAN_USER_HOME="$(pwd)"
       - export CONAN_USER_HOME_SHORT="$(pwd)"
       - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
       - mkdir .conan
-      - cd .conan
+      - pushd .conan
       - curl -Lo armeabi-v7a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/armeabi-v7a.txz
       - sha256sum -c <<< 'e5a7df93703930d4e8783b8228cfdb28d73c3811d79522df8083231fea2ad00e  armeabi-v7a.txz'
       - tar -xf armeabi-v7a.txz
       - rm armeabi-v7a.txz
-      - cd ..
+      - popd
       - printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
       - conan profile new default --detect
       - conan info . --profile:build=default --profile:host=CI/conan/android-32
@@ -771,16 +772,17 @@ Builds:
       - make
       - popd
       - pip install $$conan$$
+      - cd ../..
       - export CONAN_USER_HOME="$(pwd)"
       - export CONAN_USER_HOME_SHORT="$(pwd)"
       - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
       - mkdir .conan
-      - cd .conan
+      - pushd .conan
       - curl -Lo aarch64-v8a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/aarch64-v8a.txz
       - sha256sum -c <<< 'b41033513458e4658a628b35065c31144a50453a45e621ae4014fc8994d6e6c9  aarch64-v8a.txz'
       - tar -xf aarch64-v8a.txz
       - rm aarch64-v8a.txz
-      - cd ..
+      - popd
       - printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
       - conan profile new default --detect
       - conan info . --profile:build=default --profile:host=CI/conan/android-64