diff --git a/Makefile b/Makefile
index 087f391cb..0ca704bef 100644
--- a/Makefile
+++ b/Makefile
@@ -220,11 +220,7 @@ release:
 
 gomobile-install:
 	go get -u golang.org/x/mobile/cmd/gomobile
-ifdef NDK_GOMOBILE
-	gomobile init -ndk $(NDK_GOMOBILE)
-else
 	gomobile init
-endif
 
 release-install:
 	go get -u github.com/c4milo/github-release
diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android
index 03ea13fd6..dd248877c 100644
--- a/_assets/ci/Jenkinsfile.android
+++ b/_assets/ci/Jenkinsfile.android
@@ -2,6 +2,8 @@ pipeline {
   agent { label 'linux' }
 
   options {
+    timestamps()
+    disableConcurrentBuilds()
     /* Go requires a certain directory structure */
     checkoutToSubdirectory('src/github.com/status-im/status-go')
     /* manage how many builds we keep */
@@ -19,8 +21,9 @@ pipeline {
     PATH             = "${env.PATH}:${env.GOPATH}/bin"
     ANDROID_HOME     = '/usr/lib/android-sdk'
     ANDROID_SDK_ROOT = '/usr/lib/android-sdk'
-    ANDROID_NDK      = '/usr/lib/android-ndk'
-    ANDROID_NDK_HOME = '/usr/lib/android-ndk'
+    /* gomobile requires a specific NDK version */
+    ANDROID_NDK      = "${env.NDK_GOMOBILE}"
+    ANDROID_NDK_HOME = "${env.NDK_GOMOBILE}"
   }
 
   stages {
diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios
index 6782c8603..e15116011 100644
--- a/_assets/ci/Jenkinsfile.ios
+++ b/_assets/ci/Jenkinsfile.ios
@@ -2,6 +2,8 @@ pipeline {
   agent { label 'macos' }
 
   options {
+    timestamps()
+    disableConcurrentBuilds()
     /* Go requires a certain directory structure */
     checkoutToSubdirectory('src/github.com/status-im/status-go')
     /* manage how many builds we keep */
diff --git a/_assets/ci/Jenkinsfile.linux b/_assets/ci/Jenkinsfile.linux
index 0fb25d1fc..30d62c6c7 100644
--- a/_assets/ci/Jenkinsfile.linux
+++ b/_assets/ci/Jenkinsfile.linux
@@ -2,6 +2,8 @@ pipeline {
   agent { label 'linux' }
 
   options {
+    timestamps()
+    disableConcurrentBuilds()
     /* Go requires a certain directory structure */
     checkoutToSubdirectory('src/github.com/status-im/status-go')
     /* manage how many builds we keep */