diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
index 14a01b0e..ef6b29f4 100644
--- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
@@ -149,7 +149,7 @@ ubuntu2004-makefile-gcc-deploy:
       - $NIGHTLY_MASTER
       - $DEPLOY_LINUX
  script:
-   - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$LINUX_PLATFORM/$APP_FOLDER
+   - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER
    - |-
      if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then
        rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM
@@ -166,5 +166,5 @@ ubuntu2004-makefile-gcc-plugins-deploy:
     variables:
       - $DEPLOY_PLUGINS
  script:
-   - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/
+   - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/
 
diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index f40c306d..c9c5459e 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -148,10 +148,10 @@ macosx-makefile-deploy:
       - $NIGHTLY_MASTER
       - $DEPLOY_MACOSX
  script:
-   - rsync -rlv --ignore-existing build/OUTPUT/Linphone*/macos/Packages/Linphone*.dmg $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM/$APP_FOLDER
+   - rsync -rlv --ignore-existing build/OUTPUT/Linphone*/macos/Packages/Linphone*.dmg $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER
    - |-
      if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then
-       rsync -rlv build/OUTPUT/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM
+       rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM
      fi
 
 
@@ -164,5 +164,5 @@ macosx-makefile-plugins-deploy:
     variables:
       - $DEPLOY_PLUGINS
  script:
-   - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $DEPLOY_SERVER:$UPLOAD_ROOT_INTERNAL_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins
+   - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.dylib $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER/plugins
 
diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml
index a7db7737..42f4a571 100644
--- a/.gitlab-ci-files/windows-desktop.yml
+++ b/.gitlab-ci-files/windows-desktop.yml
@@ -204,9 +204,9 @@ win64-ninja-vs2022-package-windows:
     - if: $DEPLOY_WINDOWS
 
   script:
-    - scp -pr build-desktop/OUTPUT/Packages/*.exe ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER}
-    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/ }
-    #  - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
+    - scp -pr build-desktop/OUTPUT/Packages/*.exe ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/${APP_FOLDER}
+    #- if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${DEPLOY_SERVER}:${UPLOAD_ROOT_INTERNAL_PATH}/${WINDOWS_PLATFORM}/ }
+    - if ($MAKE_RELEASE_FILE_URL) { scp -pr build-desktop/OUTPUT/RELEASE ${MAIN_DEPLOY_SERVER}:${UPLOAD_ROOT_PATH}/${WINDOWS_PLATFORM}/ }
 
 win64-ninja-vs2022-upload:
   extends:
@@ -220,7 +220,7 @@ win64-ninja-vs2022-upload:
   rules:
     - if: $DEPLOY_PLUGINS
   script:
-    - scp "build-desktop/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_INTERNAL_DIRECTORY%/plugins"
+    - scp "build-desktop/OUTPUT/plugins/app/*.dll" "%MAIN_DEPLOY_SERVER%:%WINDOWS_UPLOAD_DIRECTORY%/plugins"
 
 win64-ninja-vs2022-plugins-upload:
   extends: .win64-plugins-upload
diff --git a/cmake/install/macos/app_notarization.sh b/cmake/install/macos/app_notarization.sh
index 3c30a0ac..a8ee826e 100755
--- a/cmake/install/macos/app_notarization.sh
+++ b/cmake/install/macos/app_notarization.sh
@@ -3,7 +3,7 @@
 #Notarization for Mac. Launch it from the build folder
 
 #rm notarize_result.plist
-FILES=OUTPUT/Linphone/macos/Packages/*.dmg
+FILES=OUTPUT/Linphone*/macos/Packages/*.dmg
 for f in $FILES
 do
 	linphone_file=$f