diff --git a/.circleci/config.yml b/.circleci/config.yml
index 918545292..afc2801f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,8 +27,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -57,7 +57,7 @@ jobs:
 
       - run:
           name: Build
-          no_output_timeout: 58m
+          no_output_timeout: 30m
           command: make IGNORE_ERRORS=m -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/install -j2
 
       - run:
@@ -85,8 +85,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -142,8 +142,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -199,8 +199,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -256,8 +256,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -313,8 +313,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -372,8 +372,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -429,8 +429,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 54 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 58 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 55 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 59 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys: