diff --git a/Jenkinsfile b/Jenkinsfile
index ba0d57578..271872d70 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -104,6 +104,7 @@ pipeline
                                 {
                                     archiveArtifacts 'CarlaUE4.log'
                                     junit 'Build/test-results/smoke-tests-*.xml'
+                                    deleteDir()
                                 }
                             }
                         }
@@ -124,6 +125,7 @@ pipeline
                                 sh 'rm -rf ~/carla-simulator.github.io/Doxygen'
                                 sh '''
                                     cd ~/carla-simulator.github.io
+                                    git fetch
                                     git checkout -B master origin/master
                                 '''
                                 sh 'make docs'
@@ -136,6 +138,13 @@ pipeline
                                 '''
                             }
                         }
+                        stage('Cleanning')
+                        {
+                            steps
+                            {
+                                deleteDir()
+                            }
+                        }
                     }
                 }
                 // stage('windows')
@@ -230,19 +239,4 @@ pipeline
             }
         }
     }
-
-    post
-    {
-        always
-        {
-            node('build')
-            {
-                deleteDir()
-            }
-            node('gpu')
-            {
-                deleteDir()
-            }
-        }
-    }
 }