diff --git a/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb b/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
index ed96e1cf18e661b1510f95a53cc7f7c63adcba72..6d6c27e01cda700a4eea7cb6583f6ac3d01c48cf 100644
--- a/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
+++ b/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
@@ -92,18 +92,22 @@ def create_organization
               path: 'gitlab'
             }
 
+            organization = ::Organizations::Organization.find_by_path(args[:path])
+
+            return organization if organization
+
             logger.info(message: 'Creating organization', **args)
 
             ensure_success(::Organizations::CreateService.new(current_user: @user, params: args).execute[:organization])
           end
 
           def create_groups_and_projects
-            root_group_1 = ensure_group(name: 'top-level group 1', organization: @organization)
-            root_group_2 = ensure_group(name: 'top-level group 2', organization: @organization)
-            group_1_1 = ensure_group(name: 'group 1.1', parent_id: root_group_1.id, organization: @organization)
-            group_1_1_1 = ensure_group(name: 'group 1.1.1', parent_id: group_1_1.id, organization: @organization)
-            group_1_1_2 = ensure_group(name: 'group 1.1.2', parent_id: group_1_1.id, organization: @organization)
-            group_2_1 = ensure_group(name: 'group 2.1', parent_id: root_group_2.id, organization: @organization)
+            root_group_1 = ensure_group(name: 'top-level group 1', organization_id: @organization.id)
+            root_group_2 = ensure_group(name: 'top-level group 2', organization_id: @organization.id)
+            group_1_1 = ensure_group(name: 'group 1.1', parent_id: root_group_1.id)
+            group_1_1_1 = ensure_group(name: 'group 1.1.1', parent_id: group_1_1.id)
+            group_1_1_2 = ensure_group(name: 'group 1.1.2', parent_id: group_1_1.id)
+            group_2_1 = ensure_group(name: 'group 2.1', parent_id: root_group_2.id)
 
             {
               root_group_1: root_group_1,
@@ -112,12 +116,12 @@ def create_groups_and_projects
               group_1_1_1: group_1_1_1,
               group_1_1_2: group_1_1_2,
               project_1_1_1_1: ensure_project(
-                name: 'project 1.1.1.1', namespace_id: group_1_1_1.id, organization: @organization),
+                name: 'project 1.1.1.1', namespace_id: group_1_1_1.id, organization_id: @organization.id),
               project_1_1_2_1: ensure_project(
-                name: 'project 1.1.2.1', namespace_id: group_1_1_2.id, organization: @organization),
+                name: 'project 1.1.2.1', namespace_id: group_1_1_2.id, organization_id: @organization.id),
               group_2_1: group_2_1,
               project_2_1_1: ensure_project(
-                name: 'project 2.1.1', namespace_id: group_2_1.id, organization: @organization)
+                name: 'project 2.1.1', namespace_id: group_2_1.id, organization_id: @organization.id)
             }
           end
 
@@ -178,9 +182,7 @@ def generate_name(name)
           def create_group(**args)
             logger.info(message: 'Creating group', **args)
 
-            Namespace.with_disabled_organization_validation do
-              ensure_success(::Groups::CreateService.new(@user, **args).execute[:group])
-            end
+            ensure_success(::Groups::CreateService.new(@user, **args).execute[:group])
           end
 
           def ensure_project(name:, namespace_id:, **args)
@@ -196,9 +198,7 @@ def ensure_project(name:, namespace_id:, **args)
           def create_project(**args)
             logger.info(message: 'Creating project', **args)
 
-            Namespace.with_disabled_organization_validation do
-              ensure_success(::Projects::CreateService.new(@user, **args).execute)
-            end
+            ensure_success(::Projects::CreateService.new(@user, **args).execute)
           end
 
           def register_record(record, records)
diff --git a/spec/support/helpers/disable_namespace_organization_validation.yml b/spec/support/helpers/disable_namespace_organization_validation.yml
index 63cf1f1ffc95af459f721c49981a99034ca315a0..2b3003d9c160ea7eb376c80f02a0fdec735844ac 100644
--- a/spec/support/helpers/disable_namespace_organization_validation.yml
+++ b/spec/support/helpers/disable_namespace_organization_validation.yml
@@ -57,7 +57,6 @@
 - spec/lib/gitlab/auth/saml/user_spec.rb
 - spec/lib/gitlab/import/placeholder_user_creator_spec.rb
 - spec/lib/gitlab/import/source_user_mapper_spec.rb
-- spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb
 - spec/models/hooks/system_hook_spec.rb
 - spec/requests/api/groups_spec.rb
 - spec/requests/import/gitlab_groups_controller_spec.rb
@@ -66,4 +65,3 @@
 - spec/services/groups/create_service_spec.rb
 - spec/services/groups/nested_create_service_spec.rb
 - spec/services/resource_access_tokens/create_service_spec.rb
-- spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb