diff --git a/.gitlab/ci/download/download.gitlab-ci.yml b/.gitlab/ci/download/download.gitlab-ci.yml
index 34908130d8b8b7bb02d425a03ee0a20ac2e91e2f..90ce0e1cdc5376c7dbe23809d8136859eb8fb936 100644
--- a/.gitlab/ci/download/download.gitlab-ci.yml
+++ b/.gitlab/ci/download/download.gitlab-ci.yml
@@ -20,11 +20,17 @@ include:
   # NOTE:
   # For this script to work the var DEPENDENCY_JOB must be defined ; 
   #  - DEPENDENCY_JOB: the name of the specific job that will serve as reference.
-  script:
+  before_script :
     - set -x
     - !reference [.ubuntu:download:setup, script]
     - !reference [.ubuntu:download:list_dependencies, script]
     - !reference [.ubuntu:download:select_jobs, script]
+    - !reference [.ubuntu:download:artifacts, script]
+    - set +x
+
+  script:
+    - set -x
+    - !reference [.ubuntu:download:setup, script] # sometimes only the script must be called & not the before_script hence setup must be here.
     - echo $DEPS_NAMES[@]
     - set +x
     - echo "Retrieving artifacts of selected jobs."
diff --git a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
index c135deada684587ed74126a1e07793d9b3715389..5205ef390cd8f285407fd83caf3008441db46e9c 100644
--- a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
+++ b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
@@ -1,6 +1,5 @@
 include:
   - local: '/.gitlab/ci/default.gitlab-ci.yml'
-  # Static analysis job
   - local: '/.gitlab/ci/static_analysis/cpp.gitlab-ci.yml'
 
 ####################################################################################################
@@ -24,7 +23,7 @@ include:
     - !reference [.retrieve_deps:apt, script]
 
     - DEPENDENCY_JOB="$CI_JOB_NAME"
-    - !reference [.ubuntu:download:artifacts, script] # located in common.gitlab-ci.yml
+    - !reference [.ubuntu:download:artifacts, before_script]
     # Build current module
     - export CMAKE_PREFIX_PATH=$AIDGE_INSTALL
     - echo "Build directory :$BUILD_DIR"
diff --git a/.gitlab/ci/ubuntu_python.gitlab-ci.yml b/.gitlab/ci/ubuntu_python.gitlab-ci.yml
index e881c3ff97b2cf8f8be2e8f4bca00621426cc6a8..ea32ffb6fed6017f12126e087d943ddbacd2b7ae 100644
--- a/.gitlab/ci/ubuntu_python.gitlab-ci.yml
+++ b/.gitlab/ci/ubuntu_python.gitlab-ci.yml
@@ -1,6 +1,5 @@
 include:
   - local: '/.gitlab/ci/default.gitlab-ci.yml'
-  # Static analysis job
   - local: '/.gitlab/ci/static_analysis/python.gitlab-ci.yml'
 
 ####################################################################################################
@@ -16,7 +15,7 @@ build:ubuntu_python:
     - apt-get install -qq -y cmake python-is-python3 pip 
     - !reference [.retrieve_deps:apt, script]
     - DEPENDENCY_JOB="build:ubuntu_python"
-    - !reference [.ubuntu:download:artifacts, script] 
+    - !reference [.ubuntu:download:artifacts, before_script] 
     - python3 -m pip install virtualenv
 
   script:
diff --git a/.gitlab/ci/windows_cpp.gitlab-ci.yml b/.gitlab/ci/windows_cpp.gitlab-ci.yml
index 81c075ab8d5d55d9dfdafb9a6e2851ebfeaf7fd1..2a46faf98294eec568d01be9822ba178e40d069a 100644
--- a/.gitlab/ci/windows_cpp.gitlab-ci.yml
+++ b/.gitlab/ci/windows_cpp.gitlab-ci.yml
@@ -25,7 +25,7 @@ build:windows_cpp:
     - $env:CMAKE_PREFIX_PATH = $env:AIDGE_INSTALL
     # Download dependencies if required
     - $DEPENDENCY_JOB="build:windows_cpp"
-    - !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml
+    - !reference [.windows:download:artifacts, before_script]
 
   script:
     - Write-Host "Build directory :$env:BUILD_DIR"
diff --git a/.gitlab/ci/windows_python.gitlab-ci.yml b/.gitlab/ci/windows_python.gitlab-ci.yml
index 2302b79306a620b876a4eaa0b63b3eb56f9a8ad9..a98ebbbb23ce73d4a69b9d0769234e9180338f4f 100644
--- a/.gitlab/ci/windows_python.gitlab-ci.yml
+++ b/.gitlab/ci/windows_python.gitlab-ci.yml
@@ -24,7 +24,7 @@ build:windows_python:
     - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
     # Download artifacts
     - $DEPENDENCY_JOB="build:windows_python"
-    - !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml
+    - !reference [.windows:download:artifacts, before_script]
 
   script:
     - python -m pip install virtualenv