diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1540f4..17fd6f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,12 +8,12 @@ stages:
 before_script:
   - apt-get update -yqq
   - apt-get install zip unzip git -yqq
-  - curl --silent --show-error https://getcomposer.org/installer | php
 
 # 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
     - mkdir tpl_c
     - php vendor/bin/php-cs-fixer fix --verbose --dry-run
@@ -28,10 +28,14 @@ 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
   - mkdir tpl_c
-  - zip -r latest.zip .
+  - mkdir framadate
+  - mv * framadate
+  - zip -r latest.zip framadate
   - mkdir .public
   - cp latest.zip .public
   - mv .public public
@@ -46,6 +50,7 @@ funky:
   stage: funky
   script:
   - git checkout funky
+  - curl --silent --show-error https://getcomposer.org/installer | php
   - php composer.phar install
   - mkdir tpl_c
   - mkdir .public