diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4a682836f73b64e8a7651e6ce4370d93507621e..106288049fb118cf3f7e9019215b5006b2f2cc88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,7 @@ ci:windows:
     - /^bugfix-.*$/
   artifacts:
     paths:
-    - call .\\BuildServer\\Windows\\Build
+    - .\\BuildServer\\Windows\\Build
     expire_in: 1 day
   tags:
     - windows
@@ -132,6 +132,6 @@ deploy:windows:
   tags:
     - windows
 clean:windows:
-  stage:clean
+  stage: clean
   script:
     - call .\\BuildServer\\Windows\\clean.bat
diff --git a/BuildServer/Windows/build.bat b/BuildServer/Windows/build.bat
index d128afd300432cc2b817ae515a4c40cf038ea9df..08daf3d5232b04dba52d35053a5ea01c13bcb30a 100755
--- a/BuildServer/Windows/build.bat
+++ b/BuildServer/Windows/build.bat
@@ -48,8 +48,8 @@ if %STATUS% neq 0 (
     exit %STATUS%
 )
 rem Copy netcdf dependencies
-cp "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\netcdf.dll" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\site-packages\\Scientific\\"
-cp "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\netcdf.h" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\include\\Scientific\\"
+copy "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\netcdf.dll" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\site-packages\\Scientific\\"
+copy "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\netcdf.h" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\include\\Scientific\\"
 cd ..
 rmdir /S /Q scientific-python
 
diff --git a/BuildServer/Windows/clean.bat b/BuildServer/Windows/clean.bat
index 639c79af4e6b8077fd4554d8dfa42b590cf4b459..477dbd969050fbf3ecc2d09901fed1ec4c837320 100755
--- a/BuildServer/Windows/clean.bat
+++ b/BuildServer/Windows/clean.bat
@@ -8,5 +8,7 @@ rem MDANSE_TEMPORARY_INSTALLATION_DIR
 rmdir /S /Q build
 rmdir /S /Q BuildServer\\Windows\\Build
 
-rmdir /S /Q %MDANSE_TEMPORARY_INSTALLATION_DIR%\\scientific-python
-rmdir /S /Q %MDANSE_TEMPORARY_INSTALLATION_DIR%\\mmtk
\ No newline at end of file
+rmdir /S /Q %MDANSE_TEMPORARY_INSTALLATION_DIR%
+
+rem Mandatory to ensure the script will exit withour error
+cd %MDANSE_SOURCE_DIR%
\ No newline at end of file
diff --git a/BuildServer/Windows/deploy.bat b/BuildServer/Windows/deploy.bat
index 6baf53c5d4714c833a3b3026b7ba99f06fd58026..74b2f246f0141b702bc350f4f56f9095152820a8 100755
--- a/BuildServer/Windows/deploy.bat
+++ b/BuildServer/Windows/deploy.bat
@@ -11,7 +11,7 @@ rem Copy site.py
 copy %MDANSE_SOURCE_DIR%\\BuildServer\\Windows\\Windows_resources\\site.py %MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\
 
 rem Copy Visual dll see https://stackoverflow.com/questions/214852/python-module-dlls to understand why dll copy destination folder must be the Scientific folder
-cp "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\vcruntime140.dll" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\site-packages\\Scientific\\"
+copy "%MDANSE_DEPENDENCIES_DIR%\\NetCDF\\vcruntime140.dll" "%MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\site-packages\\Scientific\\"
 
 rem create the MDANSE installer
 echo "Creating nsis installer for target %MDANSE_TEMPORARY_INSTALLATION_DIR%..."