diff --git a/.gitignore b/.gitignore
index fd137a50473..39ff95c50ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,6 @@ public/assets/
 public/uploads.*
 public/uploads/
 shared/artifacts/
-shared/tmp/artifacts-uploads/
-shared/tmp/artifacts-cache/
 rails_best_practices_output.html
 /tags
 tmp/
diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb
index 848e0bcbde1..b4e0fc5772d 100644
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
@@ -9,11 +9,11 @@ class ArtifactUploader < CarrierWave::Uploader::Base
   end
 
   def self.artifacts_upload_path
-    File.expand_path('shared/tmp/artifacts-uploads/', Rails.root)
+    File.expand_path('shared/artifacts/tmp/uploads/', Rails.root)
   end
 
   def self.artifacts_cache_path
-    File.expand_path('shared/tmp/artifacts-cache/', Rails.root)
+    File.expand_path('shared/artifacts/tmp/cache/', Rails.root)
   end
 
   def initialize(build, field)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 0ece8bd9315..8028e51dbcd 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -248,8 +248,6 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 
     # Change the permissions of the directory where CI artifacts are stored
     sudo chmod -R u+rwX shared/artifacts/
-    sudo chmod -R u+rwX shared/tmp/artifacts-uploads/
-    sudo chmod -R u+rwX shared/tmp/artifacts-cache/
 
     # Copy the example Unicorn config
     sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index b980cd8391e..077537959d7 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -134,7 +134,7 @@ module API
     end
 
     def require_gitlab_workhorse!
-      unless headers['Gitlab-Git-Http-Server'].present? || headers['GitLab-Git-HTTP-Server'].present?
+      unless env['HTTP_GITLAB_WORKHORSE'].present?
         forbidden!('Request should be executed via GitLab Workhorse')
       end
     end
diff --git a/shared/tmp/artifacts-cache/.gitkeep b/shared/artifacts/tmp/cache/.gitkeep
similarity index 100%
rename from shared/tmp/artifacts-cache/.gitkeep
rename to shared/artifacts/tmp/cache/.gitkeep
diff --git a/shared/tmp/artifacts-uploads/.gitkeep b/shared/artifacts/tmp/uploads/.gitkeep
similarity index 100%
rename from shared/tmp/artifacts-uploads/.gitkeep
rename to shared/artifacts/tmp/uploads/.gitkeep
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 92ea25a3723..0076730ef2f 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -132,7 +132,7 @@ describe Ci::API::API do
       let(:post_url) { ci_api("/builds/#{build.id}/artifacts") }
       let(:delete_url) { ci_api("/builds/#{build.id}/artifacts") }
       let(:get_url) { ci_api("/builds/#{build.id}/artifacts") }
-      let(:headers) { { "Gitlab-Git-Http-Server" => "1.0" } }
+      let(:headers) { { "GitLab-Workhorse" => "1.0" } }
       let(:headers_with_token) { headers.merge(Ci::API::Helpers::BUILD_TOKEN_HEADER => build.project.token) }
 
       describe "POST /builds/:id/artifacts/authorize" do