diff --git a/spec/features/breadcrumbs_schema_markup_spec.rb b/spec/features/breadcrumbs_schema_markup_spec.rb
index a87a3d284dedce159d93495f162202de1e6123be..f86ad5cd2ae828473b4554f6e83533bbfa7d3658 100644
--- a/spec/features/breadcrumbs_schema_markup_spec.rb
+++ b/spec/features/breadcrumbs_schema_markup_spec.rb
@@ -17,7 +17,7 @@
 
     expect(item_list.size).to eq 2
     expect(item_list[0]['name']).to eq project.namespace.name
-    expect(item_list[0]['item']).to eq user_url(project.owner)
+    expect(item_list[0]['item']).to eq user_url(project.first_owner)
 
     expect(item_list[1]['name']).to eq project.name
     expect(item_list[1]['item']).to eq project_url(project)
@@ -59,7 +59,7 @@
 
     expect(item_list.size).to eq 3
     expect(item_list[0]['name']).to eq project.namespace.name
-    expect(item_list[0]['item']).to eq user_url(project.owner)
+    expect(item_list[0]['item']).to eq user_url(project.first_owner)
 
     expect(item_list[1]['name']).to eq project.name
     expect(item_list[1]['item']).to eq project_url(project)
@@ -75,7 +75,7 @@
 
     expect(item_list.size).to eq 4
     expect(item_list[0]['name']).to eq project.namespace.name
-    expect(item_list[0]['item']).to eq user_url(project.owner)
+    expect(item_list[0]['item']).to eq user_url(project.first_owner)
 
     expect(item_list[1]['name']).to eq project.name
     expect(item_list[1]['item']).to eq project_url(project)
diff --git a/spec/features/contextual_sidebar_spec.rb b/spec/features/contextual_sidebar_spec.rb
index 29c7e0ddd216d1eba89f6f74585f741f1b406b59..cc4a0471d4ebfbbc0242c5e6c59e53c957089b0e 100644
--- a/spec/features/contextual_sidebar_spec.rb
+++ b/spec/features/contextual_sidebar_spec.rb
@@ -6,7 +6,7 @@
   context 'when context is a project' do
     let_it_be(:project) { create(:project) }
 
-    let(:user) { project.owner }
+    let(:user) { project.first_owner }
 
     before do
       sign_in(user)
diff --git a/spec/features/dashboard/snippets_spec.rb b/spec/features/dashboard/snippets_spec.rb
index 224f2111014ce5eaa19d233888972803a0935d49..f891950eeb8b68d42f563d91586601e88d0f4637 100644
--- a/spec/features/dashboard/snippets_spec.rb
+++ b/spec/features/dashboard/snippets_spec.rb
@@ -7,11 +7,11 @@
 
   context 'when the project has snippets' do
     let(:project) { create(:project, :public, creator: user) }
-    let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
+    let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.first_owner, project: project) }
 
     before do
       allow(Snippet).to receive(:default_per_page).and_return(1)
-      sign_in(project.owner)
+      sign_in(project.first_owner)
       visit dashboard_snippets_path
     end
 
@@ -27,7 +27,7 @@
     let(:project) { create(:project, :public, creator: user) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
       visit dashboard_snippets_path
     end
 
diff --git a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
index 6846d8f6ade5760730062698b1d0f32bb44a24aa..d5dbe259159d6c16dd203d6ee9912d319809f189 100644
--- a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
+++ b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
@@ -22,7 +22,7 @@
   end
 
   it 'displays the results' do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
     visit project_error_tracking_index_path(project)
     page.within(find('.gl-table')) do
       results = page.all('.table-row')
diff --git a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
index c16c9d3fb1f920ec91d99f41e6265192cc382eaf..89bf79ebb81d7ec9e5b7a9024897f413641d24fc 100644
--- a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
+++ b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
@@ -22,7 +22,7 @@
   end
 
   it 'displays the results' do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
     visit project_error_tracking_index_path(project)
 
     page.within(find('.gl-table')) do
diff --git a/spec/features/error_tracking/user_sees_error_details_spec.rb b/spec/features/error_tracking/user_sees_error_details_spec.rb
index e4a09d04ca1ac715eed291fdc1b89beed45f0899..ecbb3fe04122ea7be8755f8de15148b7e919a1e0 100644
--- a/spec/features/error_tracking/user_sees_error_details_spec.rb
+++ b/spec/features/error_tracking/user_sees_error_details_spec.rb
@@ -7,7 +7,7 @@
 
   context 'with current user as project owner' do
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit details_project_error_tracking_index_path(project, issue_id: issue_id)
     end
diff --git a/spec/features/error_tracking/user_sees_error_index_spec.rb b/spec/features/error_tracking/user_sees_error_index_spec.rb
index bc6709c659df00bd923daacbb2fdd3b49c9ef68a..21f9e688e3fc265494e41339dbc7c71ae98e2888 100644
--- a/spec/features/error_tracking/user_sees_error_index_spec.rb
+++ b/spec/features/error_tracking/user_sees_error_index_spec.rb
@@ -18,7 +18,7 @@
 
   context 'with current user as project owner' do
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit project_error_tracking_index_path(project)
     end
@@ -43,7 +43,7 @@
   context 'with error tracking settings disabled' do
     before do
       project_error_tracking_settings.update!(enabled: false)
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit project_error_tracking_index_path(project)
     end
diff --git a/spec/features/file_uploads/attachment_spec.rb b/spec/features/file_uploads/attachment_spec.rb
index 9ad404ce86915c52764ef66a417c528d0c304a75..41da0e9fbe033711fa2f3be71cf84d52ecf61c0d 100644
--- a/spec/features/file_uploads/attachment_spec.rb
+++ b/spec/features/file_uploads/attachment_spec.rb
@@ -6,7 +6,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
 
   let(:api_path) { "/projects/#{project_id}/uploads" }
diff --git a/spec/features/file_uploads/git_lfs_spec.rb b/spec/features/file_uploads/git_lfs_spec.rb
index 239afb1a1bb08a35543c3b1520b9e3da7fddb53d..8d15c5c33f78ff4bbb927b02484a1e9bb271163a 100644
--- a/spec/features/file_uploads/git_lfs_spec.rb
+++ b/spec/features/file_uploads/git_lfs_spec.rb
@@ -6,7 +6,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
 
   let(:file) { fixture_file_upload('spec/fixtures/banana_sample.gif') }
diff --git a/spec/features/file_uploads/maven_package_spec.rb b/spec/features/file_uploads/maven_package_spec.rb
index ab9f023bd8fdb7a3427218762f5f76972dd8a26b..70302142fa277625bff768e17bc721fd5004f441 100644
--- a/spec/features/file_uploads/maven_package_spec.rb
+++ b/spec/features/file_uploads/maven_package_spec.rb
@@ -6,7 +6,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
 
   let(:project_id) { project.id }
diff --git a/spec/features/file_uploads/nuget_package_spec.rb b/spec/features/file_uploads/nuget_package_spec.rb
index 871c0274445883e39d10f70f335e9a3f70b9bc07..cbffd34d4ab2c81d191cd1055518d3d020671d1b 100644
--- a/spec/features/file_uploads/nuget_package_spec.rb
+++ b/spec/features/file_uploads/nuget_package_spec.rb
@@ -6,7 +6,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
 
   let(:api_path) { "/projects/#{project.id}/packages/nuget/" }
diff --git a/spec/features/file_uploads/rubygem_package_spec.rb b/spec/features/file_uploads/rubygem_package_spec.rb
index 4a5891fdfeddbec1fe76a597e87b8cb7bdde14cf..f91fb407b286ce0826d3c0320f238c8db5f3afdd 100644
--- a/spec/features/file_uploads/rubygem_package_spec.rb
+++ b/spec/features/file_uploads/rubygem_package_spec.rb
@@ -6,7 +6,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
 
   let(:api_path) { "/projects/#{project_id}/packages/rubygems/api/v1/gems" }
diff --git a/spec/features/ide/user_commits_changes_spec.rb b/spec/features/ide/user_commits_changes_spec.rb
index 1b1e71e2862d7229339c937819796887684149f0..e1e586a4f1831696011bebbb4e974e7ccf476d55 100644
--- a/spec/features/ide/user_commits_changes_spec.rb
+++ b/spec/features/ide/user_commits_changes_spec.rb
@@ -6,7 +6,7 @@
   include WebIdeSpecHelpers
 
   let(:project) { create(:project, :public, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/ide/user_opens_merge_request_spec.rb b/spec/features/ide/user_opens_merge_request_spec.rb
index 7ae43f35901b158c7c34b141649691cabe2cac81..72fe6eb6ca8ce3988373b7704641a2bd40762bf7 100644
--- a/spec/features/ide/user_opens_merge_request_spec.rb
+++ b/spec/features/ide/user_opens_merge_request_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'IDE merge request', :js do
   let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index 2dcabb38b8f4aec28d2ba7419645c4c71673a0f5..ab7c0ce28916fdebe08e13fd213960e66188186a 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -5,11 +5,11 @@
 RSpec.describe "Internal references", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
-  let(:private_project_user) { private_project.owner }
+  let(:private_project_user) { private_project.first_owner }
   let(:private_project) { create(:project, :private, :repository) }
   let(:private_project_issue) { create(:issue, project: private_project) }
   let(:private_project_merge_request) { create(:merge_request, source_project: private_project) }
-  let(:public_project_user) { public_project.owner }
+  let(:public_project_user) { public_project.first_owner }
   let(:public_project) { create(:project, :public, :repository) }
   let(:public_project_issue) { create(:issue, project: public_project) }
   let(:public_project_merge_request) { create(:merge_request, source_project: public_project) }
diff --git a/spec/features/issues/keyboard_shortcut_spec.rb b/spec/features/issues/keyboard_shortcut_spec.rb
index 502412bab5d26a6e38efc63e1c13a16d66fd27ff..4dbc5d8e01c9cfacd433577bcda10f1f7d64a876 100644
--- a/spec/features/issues/keyboard_shortcut_spec.rb
+++ b/spec/features/issues/keyboard_shortcut_spec.rb
@@ -8,7 +8,7 @@
       let(:project) { create(:project) }
 
       before do
-        sign_in(project.owner)
+        sign_in(project.first_owner)
 
         visit project_path(project)
       end
@@ -23,7 +23,7 @@
       let(:project) { create(:project, :issues_disabled) }
 
       before do
-        sign_in(project.owner)
+        sign_in(project.first_owner)
 
         visit project_path(project)
       end
diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb
index 0e5a20fe24a7e0ddd25a2115c23ddbbfc6005443..6951d8298e5fa2ee993cdb56ebe66f4d330a3797 100644
--- a/spec/features/markdown/copy_as_gfm_spec.rb
+++ b/spec/features/markdown/copy_as_gfm_spec.rb
@@ -663,7 +663,7 @@ def current_user
     let(:project) { create(:project, :repository) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
     end
 
     context 'from a diff' do
diff --git a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
index 1087be3d8c6283616ff87c94c8842a8f41ee3f21..5894ec923c20ce35eb392aa164cc5fe66a4fe705 100644
--- a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
+++ b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
@@ -24,7 +24,7 @@
     before do
       stub_const('Autocomplete::UsersFinder::LIMIT', users_find_limit)
 
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       merge_request.assignees << assignee
 
diff --git a/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb b/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
index 3665ad91dd6c6ce5f4b9c2527432103c8c799c38..ffb9694e806596a05fc15ed9c306f6a8e392e6f3 100644
--- a/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
+++ b/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
@@ -10,7 +10,7 @@
   let(:merge_request) { create(:merge_request, source_project: project, source_branch: 'master', target_branch: 'empty-branch') }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
 
     visit diffs_project_merge_request_path(merge_request.project, merge_request)
     wait_for_requests
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb
index 7758fa8e666b4c941b4a419a779b210982f85fdb..d1be93cae0274058aba31e500673b89a0b782c56 100644
--- a/spec/features/merge_request/user_merges_merge_request_spec.rb
+++ b/spec/features/merge_request/user_merges_merge_request_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 RSpec.describe "User merges a merge request", :js do
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/merge_request/user_rebases_merge_request_spec.rb b/spec/features/merge_request/user_rebases_merge_request_spec.rb
index a3f72a6266b6bdb6cf4efc2ec84cd8c63759402e..d42864200ecb416e2fb6837f6b889ccd80dc1421 100644
--- a/spec/features/merge_request/user_rebases_merge_request_spec.rb
+++ b/spec/features/merge_request/user_rebases_merge_request_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe "User rebases a merge request", :js do
   let(:merge_request) { create(:merge_request, :simple, source_project: project) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/merge_request/user_reviews_image_spec.rb b/spec/features/merge_request/user_reviews_image_spec.rb
index 533f3c9c91adbed8c2cc4db9522fb60f3d5bf62b..bd49029482949355c2da56c85f325073ca3b9683 100644
--- a/spec/features/merge_request/user_reviews_image_spec.rb
+++ b/spec/features/merge_request/user_reviews_image_spec.rb
@@ -6,7 +6,7 @@
   include MergeRequestDiffHelpers
   include RepoHelpers
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project, author: user) }
 
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb
index a7713ed9964d9d43cb66690f3103faa7202c850e..5e022598ac3319de6b6dfdf557cb7463904f4352 100644
--- a/spec/features/merge_request/user_sees_diff_spec.rb
+++ b/spec/features/merge_request/user_sees_diff_spec.rb
@@ -82,7 +82,7 @@
     end
 
     context 'when file contains html' do
-      let(:current_user) { project.owner }
+      let(:current_user) { project.first_owner }
       let(:branch_name) {"test_branch"}
 
       it 'escapes any HTML special characters in the diff chunk header' do
@@ -123,7 +123,7 @@
 
     context 'when file is stored in LFS' do
       let(:merge_request) { create(:merge_request, source_project: project) }
-      let(:current_user) { project.owner }
+      let(:current_user) { project.first_owner }
 
       context 'when LFS is enabled on the project' do
         before do
diff --git a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
index 370341a43f97e9b77997cc7f57ab239620f15c55..e3272a6e280c0cd1e9fc8c7b64faf7d83bae0265 100644
--- a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
+++ b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
@@ -11,7 +11,7 @@
 
   let(:project) { create(:project, :repository) }
   let(:source_project) { fork_project(project, nil, repository: true) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let!(:merge_request) { create(:merge_request, :merged, source_project: source_project, target_project: project) }
 
   before do
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb
index b8c928004ed312fd3a60a7a035f0f26bf15d3667..2601dcf55c9b64e568c502edaed6ba26c4a38e42 100644
--- a/spec/features/projects/active_tabs_spec.rb
+++ b/spec/features/projects/active_tabs_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Project active tab' do
   let_it_be(:project) { create(:project, :repository) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/activity/rss_spec.rb b/spec/features/projects/activity/rss_spec.rb
index 9012b335bf4180bc53cff99493cbf7477e59bbc6..a3e511b5c226eefcb13439f9a08c0ab4f00a3a38 100644
--- a/spec/features/projects/activity/rss_spec.rb
+++ b/spec/features/projects/activity/rss_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Project Activity RSS' do
   let(:project) { create(:project, :public) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let(:path) { activity_project_path(project) }
 
   before do
@@ -13,7 +13,7 @@
 
   context 'when signed in' do
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
       visit path
     end
 
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 62994d19fc09458ae1c1810308b26736cb46b576..988051bca40defcbdc8a6dc7f9e4b511bfd26624 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -174,7 +174,7 @@ def switch_ref_to(ref_name)
       it 'displays no highlighted number of different ref' do
         Files::UpdateService.new(
           project,
-          project.owner,
+          project.first_owner,
           commit_message: 'Update',
           start_branch: 'feature',
           branch_name: 'feature',
diff --git a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
index 1c79b2ddc38df7a5751b5ef5f0514d9206ab70ed..a2db5e11c7ccbdcf798d6d1fc9e5704f2b66c794 100644
--- a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
+++ b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
@@ -6,7 +6,7 @@
   include CookieHelper
 
   let(:project) { create(:project, :empty_repo) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   describe 'viewing the new blob page' do
     before do
diff --git a/spec/features/projects/branches/user_views_branches_spec.rb b/spec/features/projects/branches/user_views_branches_spec.rb
index d0c0a0860d914f0b24b5237ba39412012687037d..b6b6dcb5cf1a7985f49b488d6655a42b95306ba1 100644
--- a/spec/features/projects/branches/user_views_branches_spec.rb
+++ b/spec/features/projects/branches/user_views_branches_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe "User views branches", :js do
   let_it_be(:project) { create(:project, :repository) }
-  let_it_be(:user) { project.owner }
+  let_it_be(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/environments_pod_logs_spec.rb b/spec/features/projects/environments_pod_logs_spec.rb
index 7d31de2b4184d1d3619584ac6f00c4b608e444e2..531eae1d6384891fe9351518e3cb4026f92bfc55 100644
--- a/spec/features/projects/environments_pod_logs_spec.rb
+++ b/spec/features/projects/environments_pod_logs_spec.rb
@@ -21,7 +21,7 @@
     stub_kubeclient_ingresses(environment.deployment_namespace)
     stub_kubeclient_nodes_and_nodes_metrics(cluster.platform.api_url)
 
-    sign_in(project.owner)
+    sign_in(project.first_owner)
   end
 
   it "shows environments in dropdown" do
diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb
index 11663158b33538182f690422eebda7e8e7a5dd06..3a0cc61d9c619a8bac2afb46a2569a4d63660346 100644
--- a/spec/features/projects/files/dockerfile_dropdown_spec.rb
+++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb
@@ -7,7 +7,7 @@
 
   before do
     project = create(:project, :repository)
-    sign_in project.owner
+    sign_in project.first_owner
     visit project_new_blob_path(project, 'master', file_name: 'Dockerfile')
   end
 
diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
index fda024e893dcd7ad51f688b02462fd9f0280a6be..e08c53a67dd7770f16f0e49ed7863668341669e9 100644
--- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb
+++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Projects > Files > User uses soft wrap while editing file', :js do
   before do
     project = create(:project, :repository)
-    user = project.owner
+    user = project.first_owner
     sign_in user
     visit project_new_blob_path(project, 'master', file_name: 'test_file-name')
 
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index 819864b3def2a6cf214bec0e225799acc027cdfd..e256bec2a1cd695159299c1777b0aeed2c4da227 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > User wants to edit a file' do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let(:commit_params) do
     {
       start_branch: project.default_branch,
diff --git a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
index 94190889acec20d31a6718506daa6514c7eaa431..a283f7d128c2dc811843ac285f294fa125b90012 100644
--- a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
+++ b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > User views files page' do
   let(:project) { create(:forked_project_with_submodules) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in user
diff --git a/spec/features/projects/files/find_file_keyboard_spec.rb b/spec/features/projects/files/find_file_keyboard_spec.rb
index 4293183fd9a6dcdb7f6b00359ebc01c1902f22e2..9ae3be4993b9a9ec1158f744431d4065b77a9c4b 100644
--- a/spec/features/projects/files/find_file_keyboard_spec.rb
+++ b/spec/features/projects/files/find_file_keyboard_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > Find file keyboard shortcuts', :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in user
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb
index d47eaee2e79306645c2c783cc9fa2b369a6af925..4a92216f46c263b69e6e74ebfec048a92fd4b5b8 100644
--- a/spec/features/projects/files/gitignore_dropdown_spec.rb
+++ b/spec/features/projects/files/gitignore_dropdown_spec.rb
@@ -7,7 +7,7 @@
 
   before do
     project = create(:project, :repository)
-    sign_in project.owner
+    sign_in project.first_owner
     visit project_new_blob_path(project, 'master', file_name: '.gitignore')
   end
 
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index fc199f66490fff14de45ee18074b753135048129..cdf6c219ea5819c99e8baaebd6d8fb52b0f0ac2c 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -11,7 +11,7 @@
   let_it_be(:project) { create(:project, :repository) }
 
   before do
-    sign_in project.owner
+    sign_in project.first_owner
     visit project_new_blob_path(project, 'master', file_name: filename, **params)
   end
 
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index ab62e8aabc0b0f825d2308d437d955aea6d22df2..4a0b1f4c5482ad8cfc03e9cf21ac2b6c5ea330f3 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
   let(:project) { create(:project, :repository) }
-  let(:project_maintainer) { project.owner }
+  let(:project_maintainer) { project.first_owner }
 
   before do
     project.repository.delete_file(project_maintainer, 'LICENSE',
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index 37583870cfd857b814ce8b93e3fc5d49576255ac..ca384291c127b533246a176d1b6b1e63866fabdf 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -6,7 +6,7 @@
   include WebIdeSpecHelpers
 
   let(:project) { create(:project_empty_repo) }
-  let(:project_maintainer) { project.owner }
+  let(:project_maintainer) { project.first_owner }
 
   before do
     sign_in(project_maintainer)
diff --git a/spec/features/projects/files/template_type_dropdown_spec.rb b/spec/features/projects/files/template_type_dropdown_spec.rb
index ca9ce841a920569f22776e3cd476a2b15e26ecf2..9cdb5eeb0768ac3789c27e726ca7a8a6b25001a6 100644
--- a/spec/features/projects/files/template_type_dropdown_spec.rb
+++ b/spec/features/projects/files/template_type_dropdown_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > Template type dropdown selector', :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in user
diff --git a/spec/features/projects/files/undo_template_spec.rb b/spec/features/projects/files/undo_template_spec.rb
index 560cb53ead21be22f614181d7a2600eac96b1585..0b2daf120632a0d698dbce37dba40a7d64a38702 100644
--- a/spec/features/projects/files/undo_template_spec.rb
+++ b/spec/features/projects/files/undo_template_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > Template Undo Button', :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in user
diff --git a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
index 4d9da783f98c15f3cee326e7eea82421f6357abe..220572c6a6dbba01fc2597b8f8550458bc7bb9e2 100644
--- a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
+++ b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
@@ -5,7 +5,7 @@
 # This is a regression test for https://gitlab.com/gitlab-org/gitlab-foss/issues/37569
 RSpec.describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js do
   let(:project) { create(:project, :empty_repo) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     project.repository.create_dir(user, 'foo/bar', branch_name: 'master', message: 'Add the foo/bar folder')
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index 508dec70db6da25d2c1c8c11a6ad288877c4e123..c764bddd3b30c9fe996e4c8fc1e216c94f4a8888 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -13,7 +13,7 @@
   let(:project) { create(:project, :repository, name: "Shop") }
   let(:project2) { create(:project, :repository, name: "Another Project", path: "another-project") }
   let(:tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb
index 176998477046f9a2065954f2203c85ebc15ec60c..3976df849fa465e7e5d357f03a6f8f9e073e1d16 100644
--- a/spec/features/projects/files/user_browses_lfs_files_spec.rb
+++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Files > User browses LFS files' do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/files/user_searches_for_files_spec.rb b/spec/features/projects/files/user_searches_for_files_spec.rb
index 7fd7dfff2795877d7a8b06c4d7b18141032c8fc9..cce73d06f94325fe8c210076da17630305f0c4c8 100644
--- a/spec/features/projects/files/user_searches_for_files_spec.rb
+++ b/spec/features/projects/files/user_searches_for_files_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Projects > Files > User searches for files' do
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/gfm_autocomplete_load_spec.rb b/spec/features/projects/gfm_autocomplete_load_spec.rb
index f4cd65bcba1cf3ed5f2c2ca19ee9253ec5a4c61c..a7d68b07dd346799852c9e11b4123762b2709ebf 100644
--- a/spec/features/projects/gfm_autocomplete_load_spec.rb
+++ b/spec/features/projects/gfm_autocomplete_load_spec.rb
@@ -6,7 +6,7 @@
   let(:project) { create(:project) }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
 
     visit project_path(project)
   end
diff --git a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
index 211576a93f38a10631589b7fb26d0b14541fd6d4..762f9c335100c9837248794b748956d4ba1627b5 100644
--- a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
@@ -6,7 +6,7 @@
   include DesignManagementTestHelpers
 
   let(:project) { create(:project_empty_repo, :public) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let(:issue) { create(:issue, project: project) }
 
   before do
diff --git a/spec/features/projects/members/owner_cannot_leave_project_spec.rb b/spec/features/projects/members/owner_cannot_leave_project_spec.rb
index fbe8583b2361561b7fb789b19006bc57df82f980..45a8f979b879c09b7e6ff7811f866d0c3181ad3b 100644
--- a/spec/features/projects/members/owner_cannot_leave_project_spec.rb
+++ b/spec/features/projects/members/owner_cannot_leave_project_spec.rb
@@ -6,7 +6,7 @@
   let(:project) { create(:project) }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
     visit project_path(project)
   end
 
diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
index 5e6e3d4d7f2fac1a7b27d8d650f4e1d2132150d2..fad5d831c19f987d0ac9b50bfa0eaf2a577d101a 100644
--- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
+++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
@@ -6,7 +6,7 @@
   let(:project) { create(:project) }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
     visit project_path(project)
   end
 
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index dcaef5f4ef0d265280dca0a3538635324fdb5193..0b00656f87b4bf788fda693bd435025081e7bfa8 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -6,7 +6,7 @@
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public, :repository) }
 
-  let(:maintainer) { project.owner }
+  let(:maintainer) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index f61eaccf5b96bf0736ffa822a45ca26834263271..91e643ff258b33372b3680c43c04584c524ab064 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -10,7 +10,7 @@
 
   let_it_be(:project) { create(:project, :repository) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 5176a7ec5a11c6c0f50b3e6db36d365a90ec58db..01c942aec4c8485d7f255b8bc348691370113164 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -715,7 +715,7 @@
         let(:schedule) do
           create(:ci_pipeline_schedule,
             project: project,
-            owner: project.owner,
+            owner: project.first_owner,
             description: 'blocked user schedule'
           ).tap do |schedule|
             schedule.update_column(:next_run_at, 1.minute.ago)
diff --git a/spec/features/projects/settings/monitor_settings_spec.rb b/spec/features/projects/settings/monitor_settings_spec.rb
index 3f6c4646f0098271bfb0f4ccf580de6f8d8cbb4a..871391fbe9c3799cc7b666bf6e848927c108b186 100644
--- a/spec/features/projects/settings/monitor_settings_spec.rb
+++ b/spec/features/projects/settings/monitor_settings_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Projects > Settings > For a forked project', :js do
   let_it_be(:project) { create(:project, :repository, create_templates: :issue) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/settings/packages_settings_spec.rb b/spec/features/projects/settings/packages_settings_spec.rb
index e70839e9720a10857e79d7fe1914e6934e5b0b57..057e6b635fe8e46abd1e3d11a1af0cf122e49f34 100644
--- a/spec/features/projects/settings/packages_settings_spec.rb
+++ b/spec/features/projects/settings/packages_settings_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Projects > Settings > Packages', :js do
   let_it_be(:project) { create(:project) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb
index b67caa5a5f97a1b5bb199a2f3c86ab22594681a4..a0d44b579a875ff3a10f40640fd0a7b84560f6bd 100644
--- a/spec/features/projects/settings/project_settings_spec.rb
+++ b/spec/features/projects/settings/project_settings_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Projects settings' do
   let_it_be(:project) { create(:project) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
   let(:panel) { find('.general-settings', match: :first) }
   let(:button) { panel.find('.btn.gl-button.js-settings-toggle') }
   let(:title) { panel.find('.settings-title') }
diff --git a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
index 91a7753fe6d1fcc124e90ebdfb58723d29ecee21..d16295aedbee31f3f0c7a14ff72ad8f51f0a37ea 100644
--- a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
+++ b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe "User interacts with deploy keys", :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/show/redirects_spec.rb b/spec/features/projects/show/redirects_spec.rb
index 659edda5672f01ae5ab9b32c35a3ae599a3aba4c..3ac82244ded33f7da232c99d78cd67294b7e606a 100644
--- a/spec/features/projects/show/redirects_spec.rb
+++ b/spec/features/projects/show/redirects_spec.rb
@@ -47,7 +47,7 @@
   it 'redirects to private project page after sign in' do
     visit project_path(private_project)
 
-    owner = private_project.owner
+    owner = private_project.first_owner
     fill_in 'user_login',    with: owner.email
     fill_in 'user_password', with: owner.password
     click_button 'Sign in'
diff --git a/spec/features/projects/show/user_manages_notifications_spec.rb b/spec/features/projects/show/user_manages_notifications_spec.rb
index 80dae4ec386639b117fdb59427a1b6f86dc90a9c..1df37eef6a944f504832713f59a206ac3ed77a92 100644
--- a/spec/features/projects/show/user_manages_notifications_spec.rb
+++ b/spec/features/projects/show/user_manages_notifications_spec.rb
@@ -6,7 +6,7 @@
   let(:project) { create(:project, :public, :repository) }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
   end
 
   def click_notifications_button
diff --git a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
index b7af0c29b33f7aabf083c9e904c76a8f816e6cc0..47e010dcf89cbe236db46e2c9ce110c69fefe7f3 100644
--- a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
+++ b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
@@ -6,7 +6,7 @@
   let(:project) { create(:project, :empty_repo, pending_delete: true) }
 
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
   end
 
   it 'shows error message if deletion for project fails' do
diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb
index e6157887c12699022c83b96d7262e09e7da867e7..5270939f681479a70efc002dcbf8816e54b4ff04 100644
--- a/spec/features/projects/show/user_sees_git_instructions_spec.rb
+++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb
@@ -61,7 +61,7 @@
       let_it_be(:project) { create(:project, :public) }
 
       before do
-        sign_in(project.owner)
+        sign_in(project.first_owner)
         visit project_path(project)
       end
 
@@ -77,7 +77,7 @@
           .at_least(:once)
           .and_return('example_branch')
 
-        sign_in(project.owner)
+        sign_in(project.first_owner)
         visit project_path(project)
       end
 
diff --git a/spec/features/projects/user_changes_project_visibility_spec.rb b/spec/features/projects/user_changes_project_visibility_spec.rb
index 68fed9b8a74e3d91d95640ba2ee905abda5f4bde..d2a7596aec0b40fa89c93e1946d0131ee9fb213b 100644
--- a/spec/features/projects/user_changes_project_visibility_spec.rb
+++ b/spec/features/projects/user_changes_project_visibility_spec.rb
@@ -43,9 +43,9 @@
 
   context 'when the project has forks' do
     before do
-      fork_project(project, project.owner)
+      fork_project(project, project.first_owner)
 
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit edit_project_path(project)
     end
@@ -84,7 +84,7 @@
     let(:project) { create(:project, :empty_repo, :public) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit edit_project_path(project)
     end
@@ -98,9 +98,9 @@
     before do
       stub_feature_flags(unlink_fork_network_upon_visibility_decrease: false)
 
-      fork_project(project, project.owner)
+      fork_project(project, project.first_owner)
 
-      sign_in(project.owner)
+      sign_in(project.first_owner)
 
       visit edit_project_path(project)
     end
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index 7bb15451538c04c8a39112f66813ed8169985c90..cd6f09ce2752e918fa4a1b0fbdd640dc10cf4a01 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'User uses shortcuts', :js do
   let_it_be(:project) { create(:project, :repository) }
 
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
index 63ee89bd11f3d3e12f97cce8bf999eef116b1d94..fbb5c24f6e181c4168ce50b05225ba174a4144f4 100644
--- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Projects > Wiki > User views wiki in project page' do
   before do
-    sign_in(project.owner)
+    sign_in(project.first_owner)
   end
 
   context 'when repository is disabled for project' do
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 26deca9c8f1ec160910d2f2810b79160a669f253..31f300753273f4f0ebdbf436517bd7de679c7f97 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -59,7 +59,7 @@
     let(:path)    { project_path(project) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
     end
 
     it 'parses Markdown' do
@@ -123,7 +123,7 @@
     let(:path)    { project_path(project) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
       visit path
     end
 
@@ -154,7 +154,7 @@
     let(:path)    { project_path(project) }
 
     before do
-      sign_in(project.owner)
+      sign_in(project.first_owner)
       visit path
     end
 
@@ -201,7 +201,7 @@
 
     it 'does not show the name of the deleted project when the source was deleted', :sidekiq_might_not_need_inline do
       forked_project
-      Projects::DestroyService.new(base_project, base_project.owner).execute
+      Projects::DestroyService.new(base_project, base_project.first_owner).execute
 
       visit project_path(forked_project)
 
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index 376f990f054882a58c018a6acef2372286527ae7..c89dd4d1f9004c755c3ee47b1be3c87cb548c9a6 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -6,7 +6,7 @@
   include ProtectedTagHelpers
 
   let(:project) { create(:project, :repository) }
-  let(:user) { project.owner }
+  let(:user) { project.first_owner }
 
   before do
     sign_in(user)
diff --git a/spec/features/security/project/snippet/internal_access_spec.rb b/spec/features/security/project/snippet/internal_access_spec.rb
index 122378631883818a1f0305f2122e4a0383d260b0..ab080f0a46098d0113fc7f0c154d34a6e321c8bb 100644
--- a/spec/features/security/project/snippet/internal_access_spec.rb
+++ b/spec/features/security/project/snippet/internal_access_spec.rb
@@ -6,8 +6,8 @@
   include AccessMatchers
 
   let_it_be(:project) { create(:project, :internal) }
-  let_it_be(:internal_snippet) { create(:project_snippet, :internal, project: project, author: project.owner) }
-  let_it_be(:private_snippet)  { create(:project_snippet, :private,  project: project, author: project.owner) }
+  let_it_be(:internal_snippet) { create(:project_snippet, :internal, project: project, author: project.first_owner) }
+  let_it_be(:private_snippet)  { create(:project_snippet, :private,  project: project, author: project.first_owner) }
 
   describe "GET /:project_path/snippets" do
     subject { project_snippets_path(project) }
diff --git a/spec/features/security/project/snippet/private_access_spec.rb b/spec/features/security/project/snippet/private_access_spec.rb
index 0c06841399d825658a1bcbbb7330cf50af54d416..1e0afc09b7456cd8d2cce97553e59ff918e5afef 100644
--- a/spec/features/security/project/snippet/private_access_spec.rb
+++ b/spec/features/security/project/snippet/private_access_spec.rb
@@ -6,7 +6,7 @@
   include AccessMatchers
 
   let_it_be(:project) { create(:project, :private) }
-  let_it_be(:private_snippet) { create(:project_snippet, :private, project: project, author: project.owner) }
+  let_it_be(:private_snippet) { create(:project_snippet, :private, project: project, author: project.first_owner) }
 
   describe "GET /:project_path/snippets" do
     subject { project_snippets_path(project) }
diff --git a/spec/features/security/project/snippet/public_access_spec.rb b/spec/features/security/project/snippet/public_access_spec.rb
index 2ae08205602396ae5d3670b4473365fddce5ac8c..f734f7ba9e2061fe8a014e829131535105e3db49 100644
--- a/spec/features/security/project/snippet/public_access_spec.rb
+++ b/spec/features/security/project/snippet/public_access_spec.rb
@@ -6,9 +6,9 @@
   include AccessMatchers
 
   let_it_be(:project) { create(:project, :public) }
-  let_it_be(:public_snippet)   { create(:project_snippet, :public,   project: project, author: project.owner) }
-  let_it_be(:internal_snippet) { create(:project_snippet, :internal, project: project, author: project.owner) }
-  let_it_be(:private_snippet)  { create(:project_snippet, :private,  project: project, author: project.owner) }
+  let_it_be(:public_snippet)   { create(:project_snippet, :public,   project: project, author: project.first_owner) }
+  let_it_be(:internal_snippet) { create(:project_snippet, :internal, project: project, author: project.first_owner) }
+  let_it_be(:private_snippet)  { create(:project_snippet, :private,  project: project, author: project.first_owner) }
 
   describe "GET /:project_path/snippets" do
     subject { project_snippets_path(project) }
diff --git a/spec/features/snippets_spec.rb b/spec/features/snippets_spec.rb
index 8cdb4bc3344b8d689e55ac626c753c9968a8a43f..35eb5c2e1934d33003030c687b95dc93aad75a18 100644
--- a/spec/features/snippets_spec.rb
+++ b/spec/features/snippets_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe 'Snippets' do
   context 'when the project has snippets' do
     let(:project) { create(:project, :public) }
-    let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
+    let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.first_owner, project: project) }
 
     before do
       allow(Snippet).to receive(:default_per_page).and_return(1)