diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 2949a7a8..5e00870f 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -25,15 +25,16 @@ build-babylon-arm64-v8a:
   script:
     - export ANDROID_NDK_HOME=/opt/android-ndk-r27
     - export BABYLON_CPP_DIR=$(pwd)/packages/babylon_tts/src/babylon_cpp
-    - cd $BABYLON_CPP_DIR
+    - pushd $BABYLON_CPP_DIR
     - mkdir build
     - cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-21
     - cmake --build build --config Release -- -j$(nproc)
-    - mkdir -p arm64-v8a/lib
-    - cp lib/* arm64-v8a/lib/
+    - popd
+    - mkdir arm64-v8a
+    - cp $BABYLON_CPP_DIR/lib/* arm64-v8a/
   artifacts:
     paths:
-      - packages/babylon_tts/src/babylon_cpp/arm64-v8a/lib/
+      - arm64-v8a/
 
 build-babylon-x86_64:
   stage: build-babylon
@@ -58,15 +59,16 @@ build-babylon-x86_64:
   script:
     - export ANDROID_NDK_HOME=/opt/android-ndk-r27
     - export BABYLON_CPP_DIR=$(pwd)/packages/babylon_tts/src/babylon_cpp
-    - cd $BABYLON_CPP_DIR
+    - pushd $BABYLON_CPP_DIR
     - mkdir -p build
     - cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DANDROID_PLATFORM=android-21
     - cmake --build build --config Release -- -j$(nproc)
-    - mkdir -p x86_64/lib
-    - cp lib/* x86_64/lib/
+    - popd
+    - mkdir -p x86_64
+    - cp $BABYLON_CPP_DIR/lib/* x86_64/
   artifacts:
     paths:
-      - packages/babylon_tts/src/babylon_cpp/x86_64/lib/
+      - x86_64/
 
 build-maid:
   stage: build-maid
@@ -97,8 +99,8 @@ build-maid:
   script:
     - export PUB_CACHE=$(pwd)/.pub-cache
     - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-    - cp packages/babylon_tts/src/babylon_cpp/arm64-v8a/lib/* ./packages/babylon_tts/android/app/src/main/jniLibs/arm64-v8a/
-    - cp packages/babylon_tts/src/babylon_cpp/x86_64/lib/* ./packages/babylon_tts/android/app/src/main/jniLibs/x86_64/
+    - cp arm64-v8a/* ./packages/babylon_tts/android/app/src/main/jniLibs/arm64-v8a/
+    - cp x86_64/* ./packages/babylon_tts/android/app/src/main/jniLibs/x86_64/
     - ./packages/flutter/bin/flutter config --no-analytics
     - ./packages/flutter/bin/flutter packages pub get
     - echo "$KEYSTORE" | base64 --decode > ./android/app/key.jks