diff --git a/.gitlab/ci/download/download.gitlab-ci.yml b/.gitlab/ci/download/download.gitlab-ci.yml
index 90ce0e1cdc5376c7dbe23809d8136859eb8fb936..5538489f1285c355d412f627f6d6f6f8f28db880 100644
--- a/.gitlab/ci/download/download.gitlab-ci.yml
+++ b/.gitlab/ci/download/download.gitlab-ci.yml
@@ -129,15 +129,20 @@ include:
 ###################################################################################################
 #                                              WINDOWS
 ###################################################################################################
-.windows:download:artifacts:
+.windows:download:setup:
   script:
     - $ErrorActionPreference = "Stop"
-    - choco install jq -Y
     - $GITLAB_ECLIPSE_URL="https://gitlab.eclipse.org"
     - $API_URL="$GITLAB_ECLIPSE_URL/api/v4"
     - Write-Host "CI project namespace $CI_PROJECT_NAMESPACE"
+    
+.windows:download:artifacts:
+  before_script: 
+    - !reference [.windows:download:setup, script]
     - !reference [.windows:download:list_dependencies, script]
-    - !reference [.windows:download:select_jobs, script] 
+    - !reference [.windows:download:select_jobs, script]
+    - !reference [.windows:download:artifacts, script]
+  script:
     - >
       for($i = 0; $i -lt $DEPS_SELECTED_JOBS.Count ; $i++) {
         $DEP_ID=$DEPS_SELECTED_JOBS[$i].pipeline.project_id
@@ -149,15 +154,13 @@ include:
       } 
     - !reference [ .windows:download:print_warning , script ]  
 
-.windows:download:dependencies:
-  script:
-    - $ErrorActionPreference = "Stop"
-    - choco install jq -Y
-    - $GITLAB_ECLIPSE_URL="https://gitlab.eclipse.org"
-    - $API_URL="$GITLAB_ECLIPSE_URL/api/v4"
-    - Write-Host "CI project namespace $CI_PROJECT_NAMESPACE"
+.windows:download:repositories:
+  before_script:
+    - !reference [.windows:download:setup, script]
     - !reference [.windows:download:list_dependencies, script]
     - !reference [.windows:download:select_jobs, script]
+    - !reference [.windows:download:repositories, script]
+  script:
     - >
       for($i = 0; $i -lt $DEPS_SELECTED_JOBS.Count ; $i++) { 
           # clone repo
diff --git a/.gitlab/ci/download/list_dependencies.gitlab-ci.yml b/.gitlab/ci/download/list_dependencies.gitlab-ci.yml
index a07b9c965726874d0955887698f842746405e824..83abd9a59ce894c8c2ad0b0ccd8c597c0c14490b 100644
--- a/.gitlab/ci/download/list_dependencies.gitlab-ci.yml
+++ b/.gitlab/ci/download/list_dependencies.gitlab-ci.yml
@@ -16,14 +16,10 @@
           DEPS_NAMES=("aidge_core")
           ;;
         # aidge_onnx needs backend_cpu for testing
-        "aidge_export_cpp" | "aidge_learning" |"aidge_onnx" ) 
+        "aidge_onnx" | "aidge_backend_cuda" | "aidge_learning" | "aidge_quantization" | "aidge_export_cpp"  ) 
           DEPS_NAMES=("aidge_core" "aidge_backend_cpu")
           ;;
-      	"aidge_backend_cuda" )
-          DEPS_NAMES=("aidge_core" "aidge_backend_cpu")
-        	;;
-        # aidge_quantization needs onnx for testing
-        "aidge_quantization" | "aidge_interop_torch"  )
+        "aidge_interop_torch" )
           DEPS_NAMES=("aidge_core" "aidge_backend_cpu" "aidge_onnx")
         	;;
       	* )
@@ -62,11 +58,12 @@
        }
        elseif( $CI_PROJECT_NAME -eq "aidge_backend_cuda" -or
                $CI_PROJECT_NAME -eq "aidge_learning" -or
-               $CI_PROJECT_NAME -eq "aidge_export_cpp" 
+               $CI_PROJECT_NAME -eq "aidge_export_cpp" -or
+               $CI_PROJECT_NAME -eq "aidge_quantization"
        ){
           $DEPS_NAMES="aidge_core","aidge_backend_cpu"
        }
-       elseif( $CI_PROJECT_NAME -eq "aidge_quantization" ){
+       elseif( $CI_PROJECT_NAME -eq "aidge_interop_torch" ){
           $DEPS_NAMES="aidge_core","aidge_backend_cpu","aidge_onnx"
        } else {
           echo "****************************************************************************************************************************"
diff --git a/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml b/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
index 8ca33bc026d83476ba6450679fc9e2a3ab551eea..10f3bb9913ea5248ac88112e111a20f297d87688 100644
--- a/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
+++ b/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
@@ -35,7 +35,7 @@ release:pip:windows:
     - python -m pip install cibuildwheel==2.17.0
     # Download repositories
     - $DEPENDENCY_JOB="build:windows_python"
-    - !reference [.windows:download:dependencies, script] # located in common.gitlab-ci.yml
+    - !reference [.windows:download:repositories, before_script] 
  
   script:
     - python -m cibuildwheel --output-dir wheelhouse --platform windows