diff --git a/config/software/gitlab-core.rb b/config/software/gitlab-core.rb
index 71ee466..bd9dff0 100644
--- a/config/software/gitlab-core.rb
+++ b/config/software/gitlab-core.rb
@@ -59,6 +59,7 @@ build do
   command "rm config/gitlab.yml config/database.yml"
 
   command "mkdir -p #{install_dir}/embedded/service/gitlab-core"
+  command "rm -rf log tmp public/uploads"
   command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-core/"
 
   # Create a wrapper for the rake tasks of the Rails app
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
index 9c246e2..2a9a1c4 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
@@ -92,11 +92,6 @@ end
   "/opt/gitlab/embedded/service/gitlab-core/public/uploads" => gitlab_core_public_uploads_dir,
   "/opt/gitlab/embedded/service/gitlab-core/log" => gitlab_core_log_dir
 }.each do |link_dir, target_dir|
-  directory link_dir do
-    action :delete
-    recursive true
-  end
-
   link link_dir do
     to target_dir
   end
--
libgit2 0.21.2