diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5efe4455bf7ee2f785980fed2d749c3e241742b..5cd06a8a0da95e4859270055af2caaa3248a9cf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,9 +29,7 @@ create_php_code_sniffer_rapport:
     - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
     - /root/.composer/vendor/bin/phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
-    - git clone --depth 1 https://gitlab.fusiondirectory.org/php-tools/PHPCompatibility.git ../PHPCompatibility
-    - git clone --depth 1 https://gitlab.fusiondirectory.org/php-tools/PHPCSUtils.git ../PHPCSUtils
-    - /root/.composer/vendor/bin/phpcs --config-set installed_paths /builds/fusiondirectory/PHPCompatibility,/builds/fusiondirectory/PHPCSUtils
+    - /root/.composer/vendor/bin/phpcs --config-set installed_paths /PHPCompatibility,/PHPCSUtils
     - /root/.composer/vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 7.3-7.4 --file-list=./filelist
 
 # phpstan
@@ -45,7 +43,6 @@ create_phpstan_rapport:
     - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - composer global require phpstan/phpstan=0.12.94
     - cp ../dev-tools/phpstan/fusiondirectory/1.4-dev/*.neon .
-    - composer global require phpstan/phpstan=0.12.94
     - /root/.composer/vendor/bin/phpstan analyse -c phpstan.neon
 
 # fusiondirectory-update-locale
@@ -78,13 +75,13 @@ build-tarballs:
   only:
     - 1.4-dev
   script:
-    - mkdir ../fusiondirectory-1.4/
-    - mv ./* ../fusiondirectory-1.4/
-    - mv  ../fusiondirectory-1.4/ ./
-    - tar -cvzf fusiondirectory-1.4.tar.gz *
+    - mkdir ../fusiondirectory-$VERSION/
+    - mv ./* ../fusiondirectory-$VERSION/
+    - mv  ../fusiondirectory-$VERSION/ ./
+    - tar -cvzf fusiondirectory-$VERSION.tar.gz *
   artifacts:
     paths:
-      - fusiondirectory-1.4.tar.gz
+      - fusiondirectory-$VERSION.tar.gz
     expire_in: 30d
 
 trigger-plugins: