diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt
index b5af1c803f..24df5fffe6 100644
--- a/metadata/com.greenaddress.greenbits_android_wallet.txt
+++ b/metadata/com.greenaddress.greenbits_android_wallet.txt
@@ -38,7 +38,7 @@ Build:1.33,33
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.36,36
     commit=1.36
@@ -52,7 +52,7 @@ Build:1.36,36
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.37,37
     commit=1.37
@@ -66,7 +66,7 @@ Build:1.37,37
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.38,38
     commit=1.38
@@ -80,7 +80,7 @@ Build:1.38,38
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.39,39
     commit=1.39
@@ -94,7 +94,7 @@ Build:1.39,39
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.41,41
     commit=1.41
@@ -108,7 +108,7 @@ Build:1.41,41
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.42,42
     commit=1.42
@@ -122,7 +122,7 @@ Build:1.42,42
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.43,43
     commit=1.43
@@ -136,7 +136,7 @@ Build:1.43,43
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.44,44
     commit=1.44
@@ -150,7 +150,7 @@ Build:1.44,44
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Build:1.45,45
     commit=1.45
@@ -164,7 +164,7 @@ Build:1.45,45
         popd && \
         cp $$AutobahnSW-greenaddress$$/target/autobahn-android-sw-0.5.2-SNAPSHOT.jar libs/
     scandelete=app/src/main/jniLibs/armeabi/libscrypt.so,app/src/main/jniLibs/mips/libscrypt.so,app/src/main/jniLibs/x86/libscrypt.so,app/scrypt/src
-    build=ANDROID_NDK=$$NDK$$ ./prepare_fdroid.sh
+    build=./prepare_fdroid.sh
 
 Maintainer Notes:
 scandelete libscrypt.so - it is built by F-Droid via prepare_fdroid.sh,
diff --git a/metadata/org.kwaak3.txt b/metadata/org.kwaak3.txt
index 3b153c4760..e4e0f2457b 100644
--- a/metadata/org.kwaak3.txt
+++ b/metadata/org.kwaak3.txt
@@ -23,7 +23,7 @@ Build:1.0,1
     target=android-10
     build=pushd ../.. && \
         chmod +x mkjni.sh && \
-        ANDROID_NDK=$$NDK$$ ./mkjni.sh && \
+        ./mkjni.sh && \
         popd
     buildjni=yes
 
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index 38007ffe9d..4955c8de97 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -97,7 +97,7 @@ Build:2.3.2-fdroid,2302
         sed -i -e 's/<application/<application android:debuggable="false"/' AndroidManifest.xml && \
         sed -i -e 's/android:versionCode/android:versionName="2.3.2-fdroid" android:versionCode/' AndroidManifest.xml
     target=android-19
-    build=ANDROID_NDK=$$NDK$$ make generate-libs BUILD_GPLV3_ZRTP=1 
+    build=make generate-libs BUILD_GPLV3_ZRTP=1 
     buildjni=no
     ndk=r10d
 
diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index 26593f84a5..48df32ee4b 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -50,7 +50,7 @@ Build:2.6,2600
     buildjni=yes
     submodules=yes
     scandelete=document-viewer/jni/mupdf/mupdf/build/debug/
-    prebuild=pushd ../ && ANDROID_NDK=$$NDK$$ ./init.sh && popd
+    prebuild=pushd ../ && ./init.sh && popd
 
 Maintainer Notes:
 Check init.sh from time to time.
diff --git a/metadata/se.leap.bitmaskclient.txt b/metadata/se.leap.bitmaskclient.txt
index b483e6d9b6..6e1baa7b2c 100644
--- a/metadata/se.leap.bitmaskclient.txt
+++ b/metadata/se.leap.bitmaskclient.txt
@@ -38,7 +38,7 @@ Build:0.9.2RC2,114
     commit=0.9.2RC2
     subdir=app
     gradle=yes
-    build=ANDROID_NDK=$$NDK$$ misc/build-native.sh
+    build=misc/build-native.sh
     buildjni=no
     ndk=r10d
 
@@ -46,7 +46,7 @@ Build:0.9.2RC3,115
     commit=0.9.2RC3
     subdir=app
     gradle=yes
-    build=ANDROID_NDK=$$NDK$$ misc/build-native.sh
+    build=misc/build-native.sh
     buildjni=no
     ndk=r10d
 
@@ -54,7 +54,7 @@ Build:0.9.2,116
     commit=0.9.2
     subdir=app
     gradle=yes
-    build=ANDROID_NDK=$$NDK$$ misc/build-native.sh
+    build=misc/build-native.sh
     buildjni=no
     ndk=r10d