diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c408019f7..f996101c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,32 @@
 include:
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
 
 build_clazy_clang_tidy:
   stage: build
   image: "kdeorg/ci-suse-qt514"
   extends: .linux
   only:
     - merge_requests
   before_script:
     - zypper install -y clazy wget
     # - git clone --depth=1 https://anongit.kde.org/sysadmin/ci-tooling $CI_TOOLING/ci-tooling
     - mkdir -p /build
     - wget https://invent.kde.org/dvratil/ci-tooling/-/archive/generate-compile-commands/ci-tooling-generate-compile-commands.tar.bz2 -O /build/ci-tooling.tar.bz2
-    - cd /build && tar -xf ci-tooling.tar.bz2 && mv ci-tooling-generate-compile-commands ci-tooling
+    - tar -xf /build/ci-tooling.tar.bz2 -C /builds/ && mv /build/ci-tooling-generate-compile-commands $CI_TOOLING
     - git clone --depth=1 https://anongit.kde.org/sysadmin/repo-metadata $CI_TOOLING/repo-metadata
     - git clone --depth=1 https://anongit.kde.org/kde-build-metadata $CI_TOOLING/kde-build-metadata
     - git clone --depth=1 https://anongit.kde.org/kde-dev-scripts $CI_TOOLING/kde-dev-scripts
-    - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX
 
   script:
     - export CC=clazy
     - export CXX=clazy
     - export CXXFLAGS="-Werror -Wno-deprecated-declarations"
     - export CLAZY_CHECKS="level0,level1,level2,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch"
+    - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX
     - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX
     - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX
     - cd build && run-clang-tidy
   variables:
     PLATFORM: SUSEQt5.14
     BRANCH_GROUP: kf5-qt5