diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 54ac5446fc..50c10db7de 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -35,7 +35,7 @@ pipeline {
   options {
     timestamps()
     /* Prevent Jenkins jobs from running forever */
-    timeout(time: 20, unit: 'MINUTES')
+    timeout(time: 25, unit: 'MINUTES')
     /* manage how many builds we keep */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
@@ -78,6 +78,16 @@ pipeline {
       }
     }
 
+    stage('Client') {
+      steps { script {
+        /* Temporary hack-fix for failing Linux builds:
+         * https://github.com/status-im/infra-ci/issues/88 */
+        timeout(10) { retry(10) {
+          sh 'make nim_status_client'
+        } }
+      } }
+    }
+
     stage('Package') {
       steps { script {
         linux.bundle('tgz-linux')
diff --git a/ci/Jenkinsfile.tests-e2e b/ci/Jenkinsfile.tests-e2e
index ab6379b976..bc53b1a930 100644
--- a/ci/Jenkinsfile.tests-e2e
+++ b/ci/Jenkinsfile.tests-e2e
@@ -93,13 +93,17 @@ pipeline {
       }
     }
 
-    stage('build') {
+    stage('Client') {
       environment {
         GANACHE_NETWORK_RPC_URL = "http://localhost:${env.GANACHE_RPC_PORT}"
       }
-      steps {
-        sh 'make'
-      }
+      steps { script {
+        /* Temporary hack-fix for failing Linux builds:
+         * https://github.com/status-im/infra-ci/issues/88 */
+        timeout(10) { retry(10) {
+          sh 'make nim_status_client'
+        } }
+      } }
     }
 
     stage('Containers') {