diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 226b028..4ab0d35 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -5,25 +5,18 @@ agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu1804
-execution_time_limit:
-  minutes: 15 # Default is 1 hour
 
 blocks:
   - name: Everything
     task:
-      prologue:
-        commands:
-          - phpbrew use php-7.4.6
-          - checkout
-          - cache restore
-          - export "PATH=./vendor/bin:${PATH}" # So we can use dependency executables
       jobs:
-      - name: CS & unit tests
-        commands:
-          - composer install --prefer-dist --no-suggest --no-interaction
-          - php-cs-fixer fix --config=.php_cs.dist --dry-run --diff -v --stop-on-violation
-          - phpunit --stop-on-failure
-      epilogue:
-        always:
+        - name: CS & unit tests
           commands:
+            - phpbrew use php-7.4.6
+            - checkout
+            - cache restore # Composer dependencies
+            - export "PATH=./vendor/bin:${PATH}" # So we can use dependency executables
+            - composer install --prefer-dist --no-suggest --no-interaction
+            - php-cs-fixer fix --config=.php_cs.dist --dry-run --diff -v --stop-on-violation
+            - phpunit --stop-on-failure
             - cache store