diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 877e63b85..63497ab77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,32 @@
-services:
-   - chill/database:latest
- 
-before_script:
-   - composer config github-oauth.github.com $GITHUB_TOKEN
-   - composer install --no-interaction 
-   - cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml
-   - php Tests/Fixtures/App/app/console.php --env=test cache:warmup
-   - php Tests/Fixtures/App/app/console.php doctrine:migrations:migrate --env=test --no-interaction
-   - php Tests/Fixtures/App/app/console.php doctrine:fixtures:load --env=test --no-interaction
+.test_definition: &test_definition
+   services:
+       - chill/database:latest
+   before_script: 
+       - if [ -z ${GITHUB_TOKEN+x} ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi
+       - composer install --no-interaction 
+       - cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml
+       - php Tests/Fixtures/App/app/console.php --env=test cache:warmup
+       - php Tests/Fixtures/App/app/console.php doctrine:migrations:migrate --env=test --no-interaction
+       - php Tests/Fixtures/App/app/console.php doctrine:fixtures:load --env=test --no-interaction
 
 test:php-5.6:
    stage: test
+   image: chill/ci-image:php-5.6
+   <<: *test_definition
    script: phpunit 
 test:php-7:
    image: chill/ci-image:php-7
    stage: test
+   <<: *test_definition
    script: phpunit
+   
+deploy-packagist:
+   stage: deploy
+   image: chill/ci-image:php-7
+   before_script: 
+       # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set
+       - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi
+       - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi
+   script:
+       - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")
+       - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi