diff --git a/run-eclair-builds.sh b/run-eclair-builds.sh
index 7d827b5..202e469 100755
--- a/run-eclair-builds.sh
+++ b/run-eclair-builds.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+LICENSE_LEASE=5400
+
 . tf-ci-scripts/eclair/utils.sh
 . tf-m-ci-scripts/eclair/utils_tfm.sh
 
@@ -18,9 +20,13 @@
     (cd psa-arch-tests; git checkout .; git clean -fq)
     (cd trusted-firmware-m; git checkout .; git clean -fq)
     eclair_tfm_set_toolchain_path
-    detachLicense 5400
+    detachLicense $LICENSE_LEASE
     tf-m-ci-scripts/run-build.sh
     cnt=$((cnt + 1))
 done
 
+# Extend license lease one final time for further processing after the builds
+# (creation of project database and rendering reports, etc.).
+detachLicense $LICENSE_LEASE
+
 echo "Built $num_configs configs"