diff --git a/metadata/com.github.wgh136.venera.yml b/metadata/com.github.wgh136.venera.yml
index 26f2ebb9e5..93b5584fc8 100644
--- a/metadata/com.github.wgh136.venera.yml
+++ b/metadata/com.github.wgh136.venera.yml
@@ -2352,8 +2352,8 @@ Builds:
     versionCode: 1451
     commit: 8eda8adcc8e8b0e1abb4248f6bee5043c8b3273a
     sudo:
-      - mkdir -p /home/runner
-      - chown vagrant /home/runner
+      - mkdir -p /home/runner/work/venera
+      - chown -R vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     binary: https://github.com/venera-app/venera/releases/download/v%v/venera-%v-armeabi-v7a.apk
     srclibs:
@@ -2365,11 +2365,6 @@ Builds:
       - macos
       - windows
     prebuild:
-      - export repo=/home/runner/work/venera
-      - mkdir -p $repo
-      - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
       - export flutterVersion=$(sed -n -E "s/.*flutter:\s([0-9.]+)/\1/p" pubspec.yaml)
       - '[[ $flutterVersion ]] || exit 1'
       - git -C $$flutter$$ checkout -f $flutterVersion
@@ -2379,15 +2374,13 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - sed -i -e '/keystoreProperties/d' android/app/build.gradle
       - sdkmanager 'cmake;3.10.2.4988404'
-      - popd
-      - mv $repo/venera com.github.wgh136.venera
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/runner/work/venera
+      - export repo=/home/runner/work/venera/venera
       - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
+      - mv com.github.wgh136.venera $repo
+      - pushd $repo
       - export CARGO_HOME=/home/runner/.cargo
       - export rustVersion=$(sed -n -E 's/channel = "(.*)"/\1/p' rust-toolchain.toml)
       - $$rustup$$/rustup-init.sh -y --default-toolchain $rustVersion --target armv7-linux-androideabi
@@ -2395,14 +2388,14 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --target-platform="android-arm"
       - popd
-      - mv $repo/venera com.github.wgh136.venera
+      - mv $repo com.github.wgh136.venera
 
   - versionName: 1.4.5
     versionCode: 1452
     commit: 8eda8adcc8e8b0e1abb4248f6bee5043c8b3273a
     sudo:
-      - mkdir -p /home/runner
-      - chown vagrant /home/runner
+      - mkdir -p /home/runner/work/venera
+      - chown -R vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     binary: https://github.com/venera-app/venera/releases/download/v%v/venera-%v-arm64-v8a.apk
     srclibs:
@@ -2414,11 +2407,6 @@ Builds:
       - macos
       - windows
     prebuild:
-      - export repo=/home/runner/work/venera
-      - mkdir -p $repo
-      - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
       - export flutterVersion=$(sed -n -E "s/.*flutter:\s([0-9.]+)/\1/p" pubspec.yaml)
       - '[[ $flutterVersion ]] || exit 1'
       - git -C $$flutter$$ checkout -f $flutterVersion
@@ -2428,15 +2416,13 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - sed -i -e '/keystoreProperties/d' android/app/build.gradle
       - sdkmanager 'cmake;3.10.2.4988404'
-      - popd
-      - mv $repo/venera com.github.wgh136.venera
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/runner/work/venera
+      - export repo=/home/runner/work/venera/venera
       - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
+      - mv com.github.wgh136.venera $repo
+      - pushd $repo
       - export CARGO_HOME=/home/runner/.cargo
       - export rustVersion=$(sed -n -E 's/channel = "(.*)"/\1/p' rust-toolchain.toml)
       - $$rustup$$/rustup-init.sh -y --default-toolchain $rustVersion --target aarch64-linux-android
@@ -2444,14 +2430,14 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --target-platform="android-arm64"
       - popd
-      - mv $repo/venera com.github.wgh136.venera
+      - mv $repo com.github.wgh136.venera
 
   - versionName: 1.4.5
     versionCode: 1453
     commit: 8eda8adcc8e8b0e1abb4248f6bee5043c8b3273a
     sudo:
-      - mkdir -p /home/runner
-      - chown vagrant /home/runner
+      - mkdir -p /home/runner/work/venera
+      - chown -R vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     binary: https://github.com/venera-app/venera/releases/download/v%v/venera-%v-x86_64.apk
     srclibs:
@@ -2463,11 +2449,6 @@ Builds:
       - macos
       - windows
     prebuild:
-      - export repo=/home/runner/work/venera
-      - mkdir -p $repo
-      - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
       - export flutterVersion=$(sed -n -E "s/.*flutter:\s([0-9.]+)/\1/p" pubspec.yaml)
       - '[[ $flutterVersion ]] || exit 1'
       - git -C $$flutter$$ checkout -f $flutterVersion
@@ -2477,15 +2458,13 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - sed -i -e '/keystoreProperties/d' android/app/build.gradle
       - sdkmanager 'cmake;3.10.2.4988404'
-      - popd
-      - mv $repo/venera com.github.wgh136.venera
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/runner/work/venera
+      - export repo=/home/runner/work/venera/venera
       - cd ..
-      - mv com.github.wgh136.venera $repo/venera
-      - pushd $repo/venera
+      - mv com.github.wgh136.venera $repo
+      - pushd $repo
       - export CARGO_HOME=/home/runner/.cargo
       - export rustVersion=$(sed -n -E 's/channel = "(.*)"/\1/p' rust-toolchain.toml)
       - $$rustup$$/rustup-init.sh -y --default-toolchain $rustVersion --target x86_64-linux-android
@@ -2493,7 +2472,7 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --target-platform="android-x64"
       - popd
-      - mv $repo/venera com.github.wgh136.venera
+      - mv $repo com.github.wgh136.venera
 
 AllowedAPKSigningKeys: 4525360bbfca22b6008becf852932fc496bd5e943a082340c34eee9cc6e8fe7c
 
diff --git a/metadata/net.retiolus.natinfo.yml b/metadata/net.retiolus.natinfo.yml
index 3eb8e24048..76e8252fb7 100644
--- a/metadata/net.retiolus.natinfo.yml
+++ b/metadata/net.retiolus.natinfo.yml
@@ -936,8 +936,8 @@ Builds:
     versionCode: 27001
     commit: 22f044b8ed9042cb2514189fafc8884df462bc5c
     sudo:
-      - mkdir -p /home/jenkins
-      - chown vagrant /home/jenkins
+      - mkdir -p /home/jenkins/agent/workspace
+      - chown -R vagrant /home/jenkins
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     binary: https://codeberg.org/retiolus/natinfo_flutter/releases/download/v%v/net.retiolus.natinfo-x86_64-v%v.apk
     srclibs:
@@ -949,11 +949,6 @@ Builds:
       - web
       - windows
     prebuild:
-      - export repo=/home/jenkins/agent/workspace
-      - mkdir -p $repo
-      - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
       - export flutterVersion=$(sed -n -E "s/^\s*flutter-version:\s(.*)/\1/p" pubspec.yaml)
       - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
@@ -973,28 +968,26 @@ Builds:
       - sed -i "/implements .*ActivityResultListener {/a public LocationClient createLocationClient(Context
         context, boolean forceAndroidLocationManager, @Nullable LocationOptions locationOptions)
         { return new LocationManagerClient(context, locationOptions); }" GeolocationManager.java
-      - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/jenkins/agent/workspace
+      - export repo=/home/jenkins/agent/workspace/natinfo_flutter_v$$VERSION$$
       - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
+      - mv net.retiolus.natinfo $repo
+      - pushd $repo
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export PATH=$$flutter$$/bin/:$PATH
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
       - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
+      - mv $repo net.retiolus.natinfo
     ndk: r27
 
   - versionName: 0.6.4
     versionCode: 27002
     commit: 22f044b8ed9042cb2514189fafc8884df462bc5c
     sudo:
-      - mkdir -p /home/jenkins
-      - chown vagrant /home/jenkins
+      - mkdir -p /home/jenkins/agent/workspace
+      - chown -R vagrant /home/jenkins
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     binary: https://codeberg.org/retiolus/natinfo_flutter/releases/download/v%v/net.retiolus.natinfo-armeabi-v%v.apk
     srclibs:
@@ -1006,11 +999,6 @@ Builds:
       - web
       - windows
     prebuild:
-      - export repo=/home/jenkins/agent/workspace
-      - mkdir -p $repo
-      - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
       - export flutterVersion=$(sed -n -E "s/^\s*flutter-version:\s(.*)/\1/p" pubspec.yaml)
       - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
@@ -1030,28 +1018,26 @@ Builds:
       - sed -i "/implements .*ActivityResultListener {/a public LocationClient createLocationClient(Context
         context, boolean forceAndroidLocationManager, @Nullable LocationOptions locationOptions)
         { return new LocationManagerClient(context, locationOptions); }" GeolocationManager.java
-      - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/jenkins/agent/workspace
+      - export repo=/home/jenkins/agent/workspace/natinfo_flutter_v$$VERSION$$
       - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
+      - mv net.retiolus.natinfo $repo
+      - pushd $repo
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export PATH=$$flutter$$/bin/:$PATH
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
       - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
+      - mv $repo net.retiolus.natinfo
     ndk: r27
 
   - versionName: 0.6.4
     versionCode: 27003
     commit: 22f044b8ed9042cb2514189fafc8884df462bc5c
     sudo:
-      - mkdir -p /home/jenkins
-      - chown vagrant /home/jenkins
+      - mkdir -p /home/jenkins/agent/workspace
+      - chown -R vagrant /home/jenkins
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     binary: https://codeberg.org/retiolus/natinfo_flutter/releases/download/v%v/net.retiolus.natinfo-arm64-v%v.apk
     srclibs:
@@ -1063,11 +1049,6 @@ Builds:
       - web
       - windows
     prebuild:
-      - export repo=/home/jenkins/agent/workspace
-      - mkdir -p $repo
-      - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
       - export flutterVersion=$(sed -n -E "s/^\s*flutter-version:\s(.*)/\1/p" pubspec.yaml)
       - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
@@ -1087,20 +1068,18 @@ Builds:
       - sed -i "/implements .*ActivityResultListener {/a public LocationClient createLocationClient(Context
         context, boolean forceAndroidLocationManager, @Nullable LocationOptions locationOptions)
         { return new LocationManagerClient(context, locationOptions); }" GeolocationManager.java
-      - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
     scandelete:
       - .pub-cache
     build:
-      - export repo=/home/jenkins/agent/workspace
+      - export repo=/home/jenkins/agent/workspace/natinfo_flutter_v$$VERSION$$
       - cd ..
-      - mv net.retiolus.natinfo $repo/natinfo_flutter_v$$VERSION$$
-      - pushd $repo/natinfo_flutter_v$$VERSION$$
+      - mv net.retiolus.natinfo $repo
+      - pushd $repo
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export PATH=$$flutter$$/bin/:$PATH
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
       - popd
-      - mv $repo/natinfo_flutter_v$$VERSION$$ net.retiolus.natinfo
+      - mv $repo net.retiolus.natinfo
     ndk: r27
 
 AllowedAPKSigningKeys: 85945c403df07dad135ac12acc5d1c31bdd88ec2809c81f72b9e63c488e0de54