diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d55a7e23c4f50a038e6d8da67f854a4065c70d95..fa125e2a5e856481a5f43d775c7efb6fbe9c9a65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gitlab-registry.cern.ch/scouting-demonstrator/scouting-docker-images/scdaq-builder:1.0.4
+image: gitlab-registry.cern.ch/scouting-demonstrator/scouting-docker-images/scdaq-builder:1.0.5
 
 check_formatting:
   stage: check
@@ -32,7 +32,7 @@ build_rpm_tag:
   only:
     - tags
   script:
-    - bash scripts/scdaqrpm.sh
+    - BUILD_SYSTEM=cmake bash scripts/scdaqrpm.sh
     - mv /tmp/scdaq-build-tmp/RPMBUILD/RPMS/x86_64/scdaq* .
   artifacts:
     name: "scdaq-${CI_JOB_NAME}_${CI_COMMIT_TAG}"
@@ -45,7 +45,7 @@ build_rpm_dev:
   except: 
     - tags
   script:
-    - bash scripts/scdaqrpm.sh
+    - BUILD_SYSTEM=cmake bash scripts/scdaqrpm.sh
     - mv /tmp/scdaq-build-tmp/RPMBUILD/RPMS/x86_64/scdaq* .
     - for f in *.rpm; do mv -- "$f" "${f%.rpm}-dev.rpm"; done # Add -dev extension to RPMs built from non-tags.
   artifacts: