diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e802f4c1149cf883c86099a6eb6d324fe2e5735d..238f413782797fa29ee21be66201758017259bd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,16 @@ phpunit:
     matrix:
       - PHP_VERSION: ['7.4', '8.0', '8.1', '8.2']
   image: iras/php-composer:${PHP_VERSION}
+  cache:
+    key: php-dependencies-${PHP_VERSION}
+    paths:
+      - ./storage/composer
   before_script:
-    - composer install
+    - export COMPOSER_CACHE_DIR=$(pwd)/storage/composer
+    # basically we are ignoring the composer.lock in tests
+    - composer update --no-interaction --ansi
   script:
-    - bin/phpunit --coverage-text
+    - bin/phpunit -c phpunit.xml --color=always --coverage-text --coverage-clover=build/logs/clover.xml
 
 packagist:
   stage: publish
diff --git a/bin/.gitignore b/bin/.gitignore
index f9c4b6635a01f85ff16909029cc049c699a9cb8d..f2f9897161ebbbf61ee81af786d61d81bc482d57 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1,3 @@
 /*
 !/.gitignore
-!/cli
+!/riki
diff --git a/bin/riki b/bin/riki
new file mode 100644
index 0000000000000000000000000000000000000000..8f4bae6557e1e2628155a9a4c2052e3c6431e419
--- /dev/null
+++ b/bin/riki
@@ -0,0 +1,10 @@
+#!/usr/bin/env php
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$app = new \App\Application(realPath(__DIR__ . '/..'));
+$kernel = new \App\Cli\CliKernel($app);
+$returnVar = $app->run($kernel);
+
+exit($returnVar);