diff --git a/CI/deploy.sh b/CI/deploy.sh
index 4c5b4fbe060b74f499e8f9c20e64ebbe05400170..f05f5ebd04fd8bd612025a7e530115d27e5e9245 100755
--- a/CI/deploy.sh
+++ b/CI/deploy.sh
@@ -86,12 +86,9 @@ then
     mv ${jobs_directory}/CookBook-*/* /home/otbpush/test/CookBook/.
 
   # Doxygen
-  ssh otbpush@otb5-vm2.orfeo-toolbox.org \
-    tar -xf ${jobs_directory}/OTB-Doxygen-*.tar.bz2 -C ${jobs_directory}/
   ssh otbpush@otb5-vm2.orfeo-toolbox.org \
     rm -rf /home/otbpush/test/Doxygen/*
-  # Too many args for mv
+  # Strip first component of the tar (Doxygen/html/...)
   ssh otbpush@otb5-vm2.orfeo-toolbox.org \
-    "cd /home/otbpush/test/latest/html && find . -mindepth 1 \ 
-      -exec mv {} /home/otbpush/test/Doxygen \;"
+    tar -xf ${jobs_directory}/OTB-Doxygen-*.tar.bz2 -C /home/otbpush/test/Doxygen/ --strip-components=1
 fi