diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 276d3b5fb79..dd6801664b1 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -15,16 +15,16 @@ module API
         optional :variables, type: Hash, desc: 'The list of variables to be injected into build'
       end
       post ":id/(ref/:ref/)trigger/pipeline", requirements: { ref: /.+/ } do
-        authenticate!
-        authorize! :admin_build, user_project
-
         # validate variables
         params[:variables] = params[:variables].to_h
         unless params[:variables].all? { |key, value| key.is_a?(String) && value.is_a?(String) }
           render_api_error!('variables needs to be a map of key-valued strings', 400)
         end
 
-        result = Ci::PipelineTriggerService.new(user_project, nil, params).execute
+        project = find_project(params[:id])
+        not_found! unless project
+
+        result = Ci::PipelineTriggerService.new(project, nil, params).execute
         not_found! unless result
 
         if result[:http_status]
diff --git a/lib/api/v3/triggers.rb b/lib/api/v3/triggers.rb
index ffc1a38acbc..e1da96104a5 100644
--- a/lib/api/v3/triggers.rb
+++ b/lib/api/v3/triggers.rb
@@ -16,16 +16,16 @@ module API
           optional :variables, type: Hash, desc: 'The list of variables to be injected into build'
         end
         post ":id/(ref/:ref/)trigger/builds", requirements: { ref: /.+/ } do
-          authenticate!
-          authorize! :admin_build, user_project
-
           # validate variables
           params[:variables] = params[:variables].to_h
           unless params[:variables].all? { |key, value| key.is_a?(String) && value.is_a?(String) }
             render_api_error!('variables needs to be a map of key-valued strings', 400)
           end
 
-          result = Ci::PipelineTriggerService.new(user_project, nil, params).execute
+          project = find_project(params[:id])
+          not_found! unless project
+
+          result = Ci::PipelineTriggerService.new(project, nil, params).execute
           not_found! unless result
 
           if result[:http_status]
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 25ec63de94a..592df038aa3 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -107,7 +107,7 @@ FactoryGirl.define do
     end
 
     trait :triggered do
-      trigger_request factory: :ci_trigger_request_with_variables
+      trigger_request factory: :ci_trigger_request_with_variables # TODO:
     end
 
     after(:build) do |build, evaluator|
diff --git a/spec/factories/ci/trigger_requests.rb b/spec/factories/ci/trigger_requests.rb
index b6239385438..10e0ab4fd3c 100644
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
@@ -2,14 +2,13 @@ FactoryGirl.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
 
-    # TODO: 
-    # factory :ci_trigger_request_with_variables do
-    #   variables do
-    #     {
-    #       TRIGGER_KEY_1: 'TRIGGER_VALUE_1',
-    #       TRIGGER_KEY_2: 'TRIGGER_VALUE_2'
-    #     }
-    #   end
-    # end
+    factory :ci_trigger_request_with_variables do
+      variables do
+        {
+          TRIGGER_KEY_1: 'TRIGGER_VALUE_1',
+          TRIGGER_KEY_2: 'TRIGGER_VALUE_2'
+        }
+      end
+    end
   end
 end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 037ac00d39f..3f59a66403b 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -292,7 +292,7 @@ feature 'Jobs' do
     end
 
     feature 'Variables' do
-      let(:trigger_request) { create(:ci_trigger_request_with_variables) }
+      let(:trigger_request) { create(:ci_trigger_request_with_variables) } # TODO:
 
       let(:job) do
         create :ci_build, pipeline: pipeline, trigger_request: trigger_request
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 3fe3ec17d36..c0ac4816ae1 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1492,7 +1492,7 @@ describe Ci::Build do
 
     context 'when build is for triggers' do
       let(:trigger) { create(:ci_trigger, project: project) }
-      let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
+      let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) } # TODO:
       let(:user_trigger_variable) do
         { key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1', public: false }
       end
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 993164aa8fe..d3b29426db1 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -559,7 +559,7 @@ describe API::Runner do
 
             before do
               trigger = create(:ci_trigger, project: project)
-              create(:ci_trigger_request_with_variables, pipeline: pipeline, builds: [job], trigger: trigger)
+              create(:ci_trigger_request_with_variables, pipeline: pipeline, builds: [job], trigger: trigger) # TODO:
               project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value')
             end
 
diff --git a/spec/requests/api/v3/triggers_spec.rb b/spec/requests/api/v3/triggers_spec.rb
index d4648136841..aca912dd427 100644
--- a/spec/requests/api/v3/triggers_spec.rb
+++ b/spec/requests/api/v3/triggers_spec.rb
@@ -37,7 +37,7 @@ describe API::V3::Triggers do
 
       it 'returns unauthorized if token is for different project' do
         post v3_api("/projects/#{project2.id}/trigger/builds"), options.merge(ref: 'master')
-        expect(response).to have_http_status(401)
+        expect(response).to have_http_status(404)
       end
     end
 
diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb
index 117f48450e2..7405df1742e 100644
--- a/spec/views/projects/jobs/show.html.haml_spec.rb
+++ b/spec/views/projects/jobs/show.html.haml_spec.rb
@@ -197,7 +197,7 @@ describe 'projects/jobs/show' do
   end
 
   describe 'shows trigger variables in sidebar' do
-    let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline) }
+    let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline) } # TODO:
 
     before do
       build.trigger_request = trigger_request