diff --git a/jh/spec/features/registrations/combined_registration_spec.rb b/jh/spec/features/registrations/combined_registration_spec.rb
index a5953dd9245c5643c7216bd08cd7a2c6e63dac86..d58c376485c6c46a03cd553dee79230c278be1a8 100644
--- a/jh/spec/features/registrations/combined_registration_spec.rb
+++ b/jh/spec/features/registrations/combined_registration_spec.rb
@@ -18,6 +18,7 @@
 
     expect(page).to have_content('Welcome to GitLab') # rubocop:disable RSpec/ExpectInHook -- need verify content
 
+    select 'Software Developer', from: 'user_onboarding_status_role'
     choose 'Just me'
     choose 'Create a new project'
     click_on 'Continue'
diff --git a/jh/spec/features/registrations/saas/invite_flow_spec.rb b/jh/spec/features/registrations/saas/invite_flow_spec.rb
index 15f36f50cfeac15b0009cee264533b87aec3bf7e..1933693a0bbc81ec53dd91bc6545e655a782fe3b 100644
--- a/jh/spec/features/registrations/saas/invite_flow_spec.rb
+++ b/jh/spec/features/registrations/saas/invite_flow_spec.rb
@@ -62,7 +62,7 @@ def registers_from_invite(user:, group:)
   end
 
   def fill_in_welcome_form
-    select 'Software Developer', from: 'user_role'
+    select 'Software Developer', from: 'user_onboarding_status_role'
     select 'A different reason', from: 'user_registration_objective'
     fill_in 'Why are you signing up? (optional)', with: 'My reason'
   end
diff --git a/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb b/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
index a59a11562005982a0ea4a3ca62a7cff9b58b9cde..c84a9573a86c0a1a283c1dad11cec4bf10c482e4 100644
--- a/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
+++ b/jh/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
@@ -31,7 +31,7 @@
   end
 
   def fills_in_welcome_form
-    select 'Software Developer', from: 'user_role'
+    select 'Software Developer', from: 'user_onboarding_status_role'
     select 'A different reason', from: 'user_registration_objective'
     fill_in 'Why are you signing up? (optional)', with: 'My reason'
 
@@ -44,7 +44,7 @@ def expect_to_see_welcome_form
 
     page.within(welcome_form_selector) do
       expect(page).to have_content('Role')
-      expect(page).to have_field('user_role', valid: false)
+      expect(page).to have_field('user_onboarding_status_role', valid: false)
       expect(page).to have_field('user_setup_for_company_true', valid: false)
       expect(page).to have_content('I\'m signing up for GitLab because:')
       expect(page).to have_content('Who will be using GitLab?')
diff --git a/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb b/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
index 12f9c59a9555214028010eef3399f6bae0d541e6..5c0dfbf8d88eb7467cbe575c039b6c8a23a6ea5f 100644
--- a/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
+++ b/jh/spec/features/registrations/sign_up_with_trial_from_external_site_without_confirmation_spec.rb
@@ -32,7 +32,7 @@
 
     fill_in_sign_up_form(user)
 
-    select 'Software Developer', from: 'user_role'
+    select 'Software Developer', from: 'user_onboarding_status_role'
     choose 'My company or team'
     choose 'Create a new project'
     click_button 'Continue'
diff --git a/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb b/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
index 80356ac4259464ecf43e280851dfa0b186717e14..94e84b3aa18887c7f4fce15640040172a197b834 100644
--- a/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
+++ b/jh/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
@@ -28,7 +28,7 @@
 
     fill_in_sign_up_form(user)
 
-    select 'Software Developer', from: 'user_role'
+    select 'Software Developer', from: 'user_onboarding_status_role'
     choose 'My company or team'
     click_button 'Continue'