diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a35c3054981ff8bf19c70a1a57a8a87db326360..961dab46f6920b73cfe7639b6360be228057ae28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,13 @@ build:
   stage: build
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE/php-build:$CI_COMMIT_REF_SLUG" -f ./docker/php-build/Dockerfile . 
-    - mkdir php-build && docker cp $(docker create "$CI_REGISTRY_IMAGE/php-build:$CI_COMMIT_REF_SLUG"):/var/www/html php-build
+    - mkdir php-build && docker cp $(docker create "$CI_REGISTRY_IMAGE/php-build:$CI_COMMIT_REF_SLUG"):/var/www/html/* php-build
     - pwd && ls -la php-build
+  after_script:
+    # Workaround to exclude unwanted files in artifact
+    - rm -rf php-build/var
   artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
     paths:
       - php-build
 
@@ -43,6 +47,7 @@ test:
     GIT_STRATEGY: none 
   dependencies: []
   script:
+    - pwd && ls -la
     - docker run $CI_REGISTRY_IMAGE/php-fpm:$CI_COMMIT_REF_SLUG sh ./tms/vendor/bin/simple-phpunit --configuration phpunit.xml.dist
   ## TODO: Define unit tests
   ## TODO: Add unit tests report as job artifact