1 files changed, 13 insertions, 1 deletions
diff --git a/app/services/ci/runners/register_runner_service.rb b/app/services/ci/runners/register_runner_service.rb
index 196d2de1a65..6588cd7e248 100644
--- a/app/services/ci/runners/register_runner_service.rb
+++ b/app/services/ci/runners/register_runner_service.rb
@@ -8,7 +8,19 @@ module Ci
 
         return unless runner_type_attrs
 
-        ::Ci::Runner.create(attributes.merge(runner_type_attrs))
+        runner = ::Ci::Runner.new(attributes.merge(runner_type_attrs))
+
+        Ci::BulkInsertableTags.with_bulk_insert_tags do
+          Ci::Runner.transaction do
+            if runner.save
+              Gitlab::Ci::Tags::BulkInsert.bulk_insert_tags!([runner])
+            else
+              raise ActiveRecord::Rollback
+            end
+          end
+        end
+
+        runner
       end
 
       private