diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec8f868..8ba26c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,14 @@
-image: php
+image: framasoft/framadate-ci
 stages:
   - test
   - deploy
   - funky
 
-# install zip, git, composer on each build
-before_script:
-  - apt-get update -yqq
-  - apt-get install zip unzip git -yqq
-
 # Run php-cs-fixer and phpunit on all branches
 test:
   stage: test
   script:
-    - curl --silent --show-error https://getcomposer.org/installer | php
-    - php composer.phar install -o  --no-interaction --no-progress --prefer-dist
+    - composer install -o  --no-interaction --no-progress --prefer-dist
     - mkdir tpl_c
     - php vendor/bin/php-cs-fixer fix --verbose --dry-run
     - vendor/bin/phpunit --bootstrap app/tests/bootstrap.php --debug app/tests
@@ -28,10 +22,8 @@ pages:
   script:
   - latesttag=$(git describe --tags)
   - git checkout ${latesttag}
-  - curl --silent --show-error https://getcomposer.org/installer | php
-  - php composer.phar install -o  --no-interaction --no-progress --prefer-dist --no-dev
-  - php composer.phar dump-autoload --optimize --no-dev --classmap-authoritative
-  - rm -rf composer.phar
+  - composer install -o  --no-interaction --no-progress --prefer-dist --no-dev
+  - composer dump-autoload --optimize --no-dev --classmap-authoritative
   - mkdir tpl_c
   - mkdir framadate
   - mv `ls -A | grep -v framadate` ./framadate
@@ -50,8 +42,7 @@ funky:
   stage: funky
   script:
   - git checkout funky
-  - curl --silent --show-error https://getcomposer.org/installer | php
-  - php composer.phar install
+  - composer install
   - mkdir tpl_c
   - mkdir .public
   - cp -r * .public