diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index 9264ed4392..bfff13e74e 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -40,13 +40,13 @@ pipeline {
           ios = cmn.buildBranch('status-react/combined/mobile-ios')
         } } }
         stage('iOS e2e') { steps { script {
-          iose2e = cmn.buildBranch('status-react/combined/mobile-ios', 'e2e')
+          iose2e = cmn.buildBranch('status-react/combined/mobile-ios-e2e')
         } } }
         stage('Android') { steps { script {
           apk = cmn.buildBranch('status-react/combined/mobile-android')
         } } }
         stage('Android e2e') { steps { script {
-          apke2e = cmn.buildBranch('status-react/combined/mobile-android', 'e2e')
+          apke2e = cmn.buildBranch('status-react/combined/mobile-android-e2e')
         } } }
       }
     }
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 470655d0cc..a5fe9db61a 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -25,7 +25,7 @@ pipeline {
   options {
     timestamps()
     /* Prevent Jenkins jobs from running forever */
-    timeout(time: 35, unit: 'MINUTES')
+    timeout(time: 40, unit: 'MINUTES')
     /* Limit builds retained */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
diff --git a/ci/common.groovy b/ci/common.groovy
index 05158f6ba7..df21495f96 100644
--- a/ci/common.groovy
+++ b/ci/common.groovy
@@ -34,13 +34,18 @@ def getBuildType() {
 
 @NonCPS
 def abortPreviousRunningBuilds() {
+  /* Aborting makes sense only for PR builds, since devs start so many of them */
+  if (!env.JOB_NAME.contains('status-react/prs')) {
+    println ">> Not aborting any previous jobs. Not a PR build."
+    return
+  }
   Run previousBuild = currentBuild.rawBuild.getPreviousBuildInProgress()
 
   while (previousBuild != null) {
     if (previousBuild.isInProgress()) {
       def executor = previousBuild.getExecutor()
       if (executor != null) {
-        echo ">> Aborting older build #${previousBuild.number}"
+        println ">> Aborting older build #${previousBuild.number}"
         executor.interrupt(Result.ABORTED, new UserInterruption(
           "newer build #${currentBuild.number}"
         ))