diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index 135cd479b8563c829b69e71c6c85da8fa8ac4e37..dcaf704181984729b9bab808bea900f15cad610c 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -634,7 +634,6 @@ RSpec/NamedSubject:
     - 'ee/spec/models/geo/every_geo_event_spec.rb'
     - 'ee/spec/models/geo/package_file_registry_spec.rb'
     - 'ee/spec/models/geo/push_user_spec.rb'
-    - 'ee/spec/models/geo/repository_updated_event_spec.rb'
     - 'ee/spec/models/geo/secondary_usage_data_spec.rb'
     - 'ee/spec/models/geo_node_spec.rb'
     - 'ee/spec/models/geo_node_status_spec.rb'
diff --git a/ee/app/models/geo/event_log.rb b/ee/app/models/geo/event_log.rb
index 676a381c9b03765d7d0e9d77f715513bf34a54e6..06dbf2c4cc362d5fff1e18f3775480b9c91668d7 100644
--- a/ee/app/models/geo/event_log.rb
+++ b/ee/app/models/geo/event_log.rb
@@ -9,48 +9,28 @@ class EventLog < ApplicationRecord
     ignore_columns %i[
       hashed_storage_migrated_event_id
       hashed_storage_attachments_event_id
+      repository_created_event_id
+      repository_updated_event_id
+      repository_deleted_event_id
+      repository_renamed_event_id
+      reset_checksum_event_id
     ], remove_with: '17.0', remove_after: '2024-05-16'
 
     include Geo::Model
     include ::EachBatch
 
     EVENT_CLASSES = %w[Geo::CacheInvalidationEvent
-                       Geo::RepositoryCreatedEvent
-                       Geo::RepositoryUpdatedEvent
-                       Geo::RepositoryDeletedEvent
-                       Geo::RepositoryRenamedEvent
                        Geo::RepositoriesChangedEvent
-                       Geo::ResetChecksumEvent
                        Geo::Event].freeze
 
     belongs_to :cache_invalidation_event,
       class_name: 'Geo::CacheInvalidationEvent',
       foreign_key: :cache_invalidation_event_id
 
-    belongs_to :repository_created_event,
-      class_name: 'Geo::RepositoryCreatedEvent',
-      foreign_key: :repository_created_event_id
-
-    belongs_to :repository_updated_event,
-      class_name: 'Geo::RepositoryUpdatedEvent',
-      foreign_key: :repository_updated_event_id
-
-    belongs_to :repository_deleted_event,
-      class_name: 'Geo::RepositoryDeletedEvent',
-      foreign_key: :repository_deleted_event_id
-
-    belongs_to :repository_renamed_event,
-      class_name: 'Geo::RepositoryRenamedEvent',
-      foreign_key: :repository_renamed_event_id
-
     belongs_to :repositories_changed_event,
       class_name: 'Geo::RepositoriesChangedEvent',
       foreign_key: :repositories_changed_event_id
 
-    belongs_to :reset_checksum_event,
-      class_name: 'Geo::ResetChecksumEvent',
-      foreign_key: :reset_checksum_event_id
-
     belongs_to :geo_event,
       class_name: 'Geo::Event',
       foreign_key: :geo_event_id,
@@ -77,12 +57,7 @@ def self.includes_events
 
     # rubocop:disable Metrics/CyclomaticComplexity
     def event
-      repository_created_event ||
-        repository_updated_event ||
-        repository_deleted_event ||
-        repository_renamed_event ||
-        repositories_changed_event ||
-        reset_checksum_event ||
+      repositories_changed_event ||
         cache_invalidation_event ||
         geo_event
     end
diff --git a/ee/app/models/geo/repository_created_event.rb b/ee/app/models/geo/repository_created_event.rb
deleted file mode 100644
index 1ddcf924db9507cad226c861a28362b258f38963..0000000000000000000000000000000000000000
--- a/ee/app/models/geo/repository_created_event.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class RepositoryCreatedEvent < ApplicationRecord
-    include Geo::Model
-    include Geo::Eventable
-
-    belongs_to :project
-
-    validates :project, :project_name, :repo_path, :repository_storage_name, presence: true
-  end
-end
diff --git a/ee/app/models/geo/repository_deleted_event.rb b/ee/app/models/geo/repository_deleted_event.rb
deleted file mode 100644
index 8375690c85b0032be715d12aedf9b347d41b4dbf..0000000000000000000000000000000000000000
--- a/ee/app/models/geo/repository_deleted_event.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class RepositoryDeletedEvent < ApplicationRecord
-    include Geo::Model
-    include Geo::Eventable
-
-    belongs_to :project
-
-    validates :project, presence: true
-  end
-end
diff --git a/ee/app/models/geo/repository_renamed_event.rb b/ee/app/models/geo/repository_renamed_event.rb
deleted file mode 100644
index bdb0f49d4be47f71a711723793a9f4216520bb46..0000000000000000000000000000000000000000
--- a/ee/app/models/geo/repository_renamed_event.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class RepositoryRenamedEvent < ApplicationRecord
-    include Geo::Model
-    include Geo::Eventable
-
-    belongs_to :project
-
-    validates :project, :repository_storage_name, :old_path_with_namespace,
-      :new_path_with_namespace, :old_wiki_path_with_namespace,
-      :new_wiki_path_with_namespace,
-      :old_path, :new_path, presence: true
-  end
-end
diff --git a/ee/app/models/geo/repository_updated_event.rb b/ee/app/models/geo/repository_updated_event.rb
deleted file mode 100644
index a797408b79c44dfeac016261934162f15ecb219d..0000000000000000000000000000000000000000
--- a/ee/app/models/geo/repository_updated_event.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class RepositoryUpdatedEvent < ApplicationRecord
-    extend ::Gitlab::Utils::Override
-    include Geo::Model
-    include Geo::Eventable
-
-    REPOSITORY = 0
-    WIKI       = 1
-    DESIGN     = 2
-
-    REPOSITORY_TYPE_MAP = {
-      ::Gitlab::GlRepository::PROJECT => REPOSITORY,
-      ::Gitlab::GlRepository::WIKI => WIKI,
-      ::Gitlab::GlRepository::DESIGN => DESIGN
-    }.freeze
-
-    belongs_to :project
-
-    enum source: { repository: REPOSITORY, wiki: WIKI, design: DESIGN }
-
-    validates :project, presence: true
-
-    def self.source_for(repository)
-      REPOSITORY_TYPE_MAP[repository.repo_type]
-    end
-  end
-end
diff --git a/ee/app/models/geo/reset_checksum_event.rb b/ee/app/models/geo/reset_checksum_event.rb
deleted file mode 100644
index 238a9d4e77a5da79d1ceb0ff807b5ef341e06266..0000000000000000000000000000000000000000
--- a/ee/app/models/geo/reset_checksum_event.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class ResetChecksumEvent < ApplicationRecord
-    include Geo::Model
-    include Geo::Eventable
-
-    belongs_to :project
-
-    validates :project, presence: true
-  end
-end
diff --git a/ee/app/services/geo/repository_renamed_event_store.rb b/ee/app/services/geo/repository_renamed_event_store.rb
deleted file mode 100644
index 98a8fe2dcdc562ca50c4ff73a442526f424db27c..0000000000000000000000000000000000000000
--- a/ee/app/services/geo/repository_renamed_event_store.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Geo
-  class RepositoryRenamedEventStore < EventStore
-    self.event_type = :repository_renamed_event
-
-    private
-
-    def build_event
-      Geo::RepositoryRenamedEvent.new(
-        project: project,
-        repository_storage_name: project.repository.storage,
-        old_path_with_namespace: old_path_with_namespace,
-        new_path_with_namespace: project.disk_path,
-        old_wiki_path_with_namespace: old_wiki_path_with_namespace,
-        new_wiki_path_with_namespace: new_wiki_path_with_namespace,
-        old_path: old_path,
-        new_path: project.path
-      )
-    end
-
-    def old_path
-      params.fetch(:old_path)
-    end
-
-    def old_path_with_namespace
-      params.fetch(:old_path_with_namespace)
-    end
-
-    def old_wiki_path_with_namespace
-      "#{old_path_with_namespace}.wiki"
-    end
-
-    def new_wiki_path_with_namespace
-      project.wiki.disk_path
-    end
-  end
-end
diff --git a/ee/spec/factories/geo/event_log.rb b/ee/spec/factories/geo/event_log.rb
index 1bb95ba17978ebff13014e038a02403882df7a52..a9997951a7ddd519d6d6050cb8c38d91547b020a 100644
--- a/ee/spec/factories/geo/event_log.rb
+++ b/ee/spec/factories/geo/event_log.rb
@@ -2,26 +2,6 @@
 
 FactoryBot.define do
   factory :geo_event_log, class: 'Geo::EventLog' do
-    trait :created_event do
-      repository_created_event factory: :geo_repository_created_event
-    end
-
-    trait :updated_event do
-      repository_updated_event factory: :geo_repository_updated_event
-    end
-
-    trait :deleted_event do
-      repository_deleted_event factory: :geo_repository_deleted_event
-    end
-
-    trait :renamed_event do
-      repository_renamed_event factory: :geo_repository_renamed_event
-    end
-
-    trait :reset_checksum_event do
-      reset_checksum_event factory: :geo_reset_checksum_event
-    end
-
     trait :cache_invalidation_event do
       cache_invalidation_event factory: :geo_cache_invalidation_event
     end
@@ -31,51 +11,10 @@
     end
   end
 
-  factory :geo_repository_created_event, class: 'Geo::RepositoryCreatedEvent' do
-    project
-
-    repository_storage_name { project.repository_storage }
-    add_attribute(:repo_path) { project.disk_path }
-    project_name { project.name }
-    wiki_path { project.wiki.disk_path }
-  end
-
-  factory :geo_repository_updated_event, class: 'Geo::RepositoryUpdatedEvent' do
-    project
-
-    source { Geo::RepositoryUpdatedEvent::REPOSITORY }
-    branches_affected { 0 }
-    tags_affected { 0 }
-  end
-
-  factory :geo_repository_deleted_event, class: 'Geo::RepositoryDeletedEvent' do
-    project
-
-    repository_storage_name { project.repository_storage }
-    deleted_path { project.full_path }
-    deleted_project_name { project.name }
-  end
-
   factory :geo_repositories_changed_event, class: 'Geo::RepositoriesChangedEvent' do
     geo_node
   end
 
-  factory :geo_repository_renamed_event, class: 'Geo::RepositoryRenamedEvent' do
-    project { association(:project, :repository) }
-
-    repository_storage_name { project.repository_storage }
-    old_path_with_namespace { project.path_with_namespace }
-    new_path_with_namespace { "#{project.path_with_namespace}_new" }
-    old_wiki_path_with_namespace { project.wiki.path_with_namespace }
-    new_wiki_path_with_namespace { "#{project.wiki.path_with_namespace}_new" }
-    old_path { project.path }
-    new_path { "#{project.path}_new" }
-  end
-
-  factory :geo_reset_checksum_event, class: 'Geo::ResetChecksumEvent' do
-    project
-  end
-
   factory :geo_cache_invalidation_event, class: 'Geo::CacheInvalidationEvent' do
     sequence(:key) { |n| "cache-key-#{n}" }
   end
diff --git a/ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb b/ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb
index ca17fce9bf28e76500e9202a9e71023c995d7b75..bb3422c8025cd9dd55237cff15aa6dd1d5b9afa2 100644
--- a/ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb
+++ b/ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb
@@ -117,7 +117,7 @@
       travel_to(13.minutes.ago) do
         gap_tracking.check!(event_id_with_gap)
       end
-      create(:geo_event_log, :updated_event, id: gap_id)
+      create(:geo_event_log, :geo_event, id: gap_id)
 
       control = ActiveRecord::QueryRecorder.new do
         expect { gap_tracking.fill_gaps(&blk) }.to change { yielded.count }.by(1)
@@ -126,8 +126,8 @@
       travel_to(12.minutes.ago) do
         gap_tracking.check!(event_id_with_gap + 3)
       end
-      create(:geo_event_log, :updated_event, id: event_id_with_gap + 1)
-      create(:geo_event_log, :updated_event, id: event_id_with_gap + 2)
+      create(:geo_event_log, :geo_event, id: event_id_with_gap + 1)
+      create(:geo_event_log, :geo_event, id: event_id_with_gap + 2)
 
       expect do
         expect { gap_tracking.fill_gaps(&blk) }.to change { yielded.count }.by(2)
diff --git a/ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb b/ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb
index 9098dac28f7131cb7c2ca76f1e4c57ceff42f401..048041e5146285c6b493b46c735fe4bf2668ecad 100644
--- a/ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb
+++ b/ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb
@@ -174,7 +174,7 @@
   end
 
   describe '#handle_single_event' do
-    let_it_be(:event_log) { create(:geo_event_log, :updated_event) }
+    let_it_be(:event_log) { create(:geo_event_log, :geo_event) }
 
     it 'skips execution when no event data is found' do
       event_log = build(:geo_event_log)
diff --git a/ee/spec/models/concerns/geo/eventable_spec.rb b/ee/spec/models/concerns/geo/eventable_spec.rb
index 6aa4b393a7e7605a78f3bd6f2cb0c3a5ef29a560..c278551a0a7d1fce796fb4014fdaac41d964271f 100644
--- a/ee/spec/models/concerns/geo/eventable_spec.rb
+++ b/ee/spec/models/concerns/geo/eventable_spec.rb
@@ -5,27 +5,27 @@
 RSpec.describe Geo::Eventable, feature_category: :geo_replication do
   describe '.up_to_event' do
     it 'finds only events up to the given geo event log id' do
-      events = create_list(:geo_event_log, 4, :updated_event)
+      events = create_list(:geo_event_log, 4, :geo_event)
 
-      expect(Geo::RepositoryUpdatedEvent.up_to_event(events.second.id)).to match_array(events.first(2).map(&:event))
+      expect(Geo::Event.up_to_event(events.second.id)).to match_array(events.first(2).map(&:event))
     end
   end
 
   describe '.delete_with_limit' do
     it 'deletes a limited amount of rows' do
-      create_list(:geo_event_log, 4, :updated_event)
+      create_list(:geo_event_log, 4, :geo_event)
 
       expect do
-        Geo::RepositoryUpdatedEvent.delete_with_limit(2)
-      end.to change { Geo::RepositoryUpdatedEvent.count }.by(-2)
+        Geo::Event.delete_with_limit(2)
+      end.to change { Geo::Event.count }.by(-2)
     end
   end
 
   describe '#consumer_klass_name' do
     it 'returns the even class name without the module part' do
-      event = build_stubbed(:geo_repository_created_event)
+      event = build_stubbed(:geo_event)
 
-      expect(event.consumer_klass_name).to eq 'RepositoryCreatedEvent'
+      expect(event.consumer_klass_name).to eq 'Event'
     end
   end
 end
diff --git a/ee/spec/models/geo/event_log_spec.rb b/ee/spec/models/geo/event_log_spec.rb
index 3dd3cdca5b21e7a40b12e9384712ccbf96e7904f..3c91ef80d8eebe59488c4ab40e25f0636928c74d 100644
--- a/ee/spec/models/geo/event_log_spec.rb
+++ b/ee/spec/models/geo/event_log_spec.rb
@@ -6,11 +6,6 @@
   describe 'relationships' do
     it { is_expected.to belong_to(:cache_invalidation_event).class_name('Geo::CacheInvalidationEvent').with_foreign_key('cache_invalidation_event_id') }
     it { is_expected.to belong_to(:repositories_changed_event).class_name('Geo::RepositoriesChangedEvent').with_foreign_key('repositories_changed_event_id') }
-    it { is_expected.to belong_to(:repository_created_event).class_name('Geo::RepositoryCreatedEvent').with_foreign_key('repository_created_event_id') }
-    it { is_expected.to belong_to(:repository_deleted_event).class_name('Geo::RepositoryDeletedEvent').with_foreign_key('repository_deleted_event_id') }
-    it { is_expected.to belong_to(:repository_renamed_event).class_name('Geo::RepositoryRenamedEvent').with_foreign_key('repository_renamed_event_id') }
-    it { is_expected.to belong_to(:repository_updated_event).class_name('Geo::RepositoryUpdatedEvent').with_foreign_key('repository_updated_event_id') }
-    it { is_expected.to belong_to(:reset_checksum_event).class_name('Geo::ResetChecksumEvent').with_foreign_key('reset_checksum_event_id') }
   end
 
   describe '.next_unprocessed_event' do
@@ -47,34 +42,6 @@
       expect(subject.event).to be_nil
     end
 
-    it 'returns repository_created_event when set' do
-      repository_created_event = build_stubbed(:geo_repository_created_event)
-      subject.repository_created_event = repository_created_event
-
-      expect(subject.event).to eq repository_created_event
-    end
-
-    it 'returns repository_updated_event when set' do
-      repository_updated_event = build(:geo_repository_updated_event)
-      subject.repository_updated_event = repository_updated_event
-
-      expect(subject.event).to eq repository_updated_event
-    end
-
-    it 'returns repository_deleted_event when set' do
-      repository_deleted_event = build(:geo_repository_deleted_event)
-      subject.repository_deleted_event = repository_deleted_event
-
-      expect(subject.event).to eq repository_deleted_event
-    end
-
-    it 'returns repository_renamed_event when set' do
-      repository_renamed_event = build(:geo_repository_renamed_event)
-      subject.repository_renamed_event = repository_renamed_event
-
-      expect(subject.event).to eq repository_renamed_event
-    end
-
     it 'returns repositories_changed_event when set' do
       repositories_changed_event = build(:geo_repositories_changed_event)
       subject.repositories_changed_event = repositories_changed_event
@@ -82,13 +49,6 @@
       expect(subject.event).to eq repositories_changed_event
     end
 
-    it 'returns reset_checksum_event when set' do
-      reset_checksum_event = build(:geo_reset_checksum_event)
-      subject.reset_checksum_event = reset_checksum_event
-
-      expect(subject.event).to eq reset_checksum_event
-    end
-
     it 'returns cache_invalidation_event when set' do
       cache_invalidation_event = build(:geo_cache_invalidation_event)
       subject.cache_invalidation_event = cache_invalidation_event
@@ -108,12 +68,5 @@
 
       expect(subject.project_id).to be_nil
     end
-
-    it 'returns event#project_id when an event respond to project_id' do
-      repository_updated_event = build(:geo_repository_updated_event)
-      subject.repository_updated_event = repository_updated_event
-
-      expect(subject.project_id).to eq repository_updated_event.project_id
-    end
   end
 end
diff --git a/ee/spec/models/geo/repository_created_event_spec.rb b/ee/spec/models/geo/repository_created_event_spec.rb
deleted file mode 100644
index 20aa5aca51302ca698aedb87e5751741b3fb67fa..0000000000000000000000000000000000000000
--- a/ee/spec/models/geo/repository_created_event_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Geo::RepositoryCreatedEvent, type: :model, feature_category: :geo_replication do
-  describe 'relationships' do
-    it { is_expected.to belong_to(:project) }
-  end
-
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
-    it { is_expected.to validate_presence_of(:project_name) }
-    it { is_expected.to validate_presence_of(:repo_path) }
-    it { is_expected.to validate_presence_of(:repository_storage_name) }
-  end
-end
diff --git a/ee/spec/models/geo/repository_renamed_event_spec.rb b/ee/spec/models/geo/repository_renamed_event_spec.rb
deleted file mode 100644
index ba50f98839360afe14adb02f57cbfc3c5eb8412e..0000000000000000000000000000000000000000
--- a/ee/spec/models/geo/repository_renamed_event_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Geo::RepositoryRenamedEvent, type: :model, feature_category: :geo_replication do
-  describe 'relationships' do
-    it { is_expected.to belong_to(:project) }
-  end
-
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
-    it { is_expected.to validate_presence_of(:repository_storage_name) }
-    it { is_expected.to validate_presence_of(:old_path_with_namespace) }
-    it { is_expected.to validate_presence_of(:new_path_with_namespace) }
-    it { is_expected.to validate_presence_of(:old_wiki_path_with_namespace) }
-    it { is_expected.to validate_presence_of(:new_wiki_path_with_namespace) }
-    it { is_expected.to validate_presence_of(:old_path) }
-    it { is_expected.to validate_presence_of(:new_path) }
-  end
-end
diff --git a/ee/spec/models/geo/repository_updated_event_spec.rb b/ee/spec/models/geo/repository_updated_event_spec.rb
deleted file mode 100644
index ce88aa4e431240cd4ff5feade8cc884db8c2d397..0000000000000000000000000000000000000000
--- a/ee/spec/models/geo/repository_updated_event_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Geo::RepositoryUpdatedEvent, type: :model, feature_category: :geo_replication do
-  describe 'relationships' do
-    it { is_expected.to belong_to(:project) }
-  end
-
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
-  end
-
-  describe '#consumer_klass_name' do
-    using RSpec::Parameterized::TableSyntax
-
-    where(:source, :consumer_klass_name) do
-      :repository | 'RepositoryUpdatedEvent'
-      :wiki | 'RepositoryUpdatedEvent'
-    end
-
-    with_them do
-      it 'returns the proper consumer class name' do
-        subject.source = source
-
-        expect(subject.consumer_klass_name).to eq consumer_klass_name
-      end
-    end
-  end
-
-  describe '#source' do
-    it { is_expected.to define_enum_for(:source).with_values([:repository, :wiki, :design]) }
-  end
-end
diff --git a/ee/spec/models/geo/reset_checksum_event_spec.rb b/ee/spec/models/geo/reset_checksum_event_spec.rb
deleted file mode 100644
index beab52812aca7eca6dd27348693ab7e46616f06d..0000000000000000000000000000000000000000
--- a/ee/spec/models/geo/reset_checksum_event_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Geo::ResetChecksumEvent, type: :model, feature_category: :geo_replication do
-  describe 'relationships' do
-    it { is_expected.to belong_to(:project) }
-  end
-
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
-  end
-end
diff --git a/ee/spec/services/geo/prune_event_log_service_spec.rb b/ee/spec/services/geo/prune_event_log_service_spec.rb
index d5691d0277a53edb44257cd117cec4fbcbf0788e..656694bfe16923a5ae7ec0abcc59517420696741 100644
--- a/ee/spec/services/geo/prune_event_log_service_spec.rb
+++ b/ee/spec/services/geo/prune_event_log_service_spec.rb
@@ -6,7 +6,7 @@
   include ExclusiveLeaseHelpers
 
   let(:min_id) { :all }
-  let!(:events) { create_list(:geo_event_log, 5, :updated_event) }
+  let!(:events) { create_list(:geo_event_log, 5, :geo_event) }
   let(:lease_key) { 'geo/prune_event_log_service' }
   let(:lease_timeout) { described_class::LEASE_TIMEOUT }
 
@@ -39,9 +39,7 @@
   end
 
   it 'prunes max 50k records' do
-    expect(service).to receive(:prune!).and_return(20_000).ordered
-    expect(service).to receive(:prune!).with(anything, 30_000).and_return(20_000).ordered
-    expect(service).to receive(:prune!).with(anything, 10_000).and_return(9_000).ordered
+    expect(service).to receive(:prune!).and_return(49_000).ordered
     expect(service).to receive(:prune!).with(anything, 1_000).and_return(1_000).ordered
     expect(service).not_to receive(:prune!).ordered
 
@@ -54,7 +52,7 @@
     end
 
     it 'prunes all associated events' do
-      expect { service.execute }.to change { Geo::RepositoryUpdatedEvent.count }.by(-5)
+      expect { service.execute }.to change { Geo::Event.count }.by(-5)
     end
   end
 
@@ -66,13 +64,13 @@
     end
 
     it 'prunes all associated events' do
-      expect { service.execute }.to change { Geo::RepositoryUpdatedEvent.count }.by(-1)
+      expect { service.execute }.to change { Geo::Event.count }.by(-1)
     end
   end
 
   describe '#prune!' do
     it 'returns the number of rows pruned' do
-      expect(service.send(:prune!, Geo::RepositoryUpdatedEvent, 50_000)).to eq(5)
+      expect(service.send(:prune!, Geo::Event, 50_000)).to eq(5)
     end
   end
 end
diff --git a/ee/spec/workers/geo/create_repository_updated_event_worker_spec.rb b/ee/spec/workers/geo/create_repository_updated_event_worker_spec.rb
index fd5469fc565b7fd5b7c77924d084c461b8b68095..9b707919e79f48af51e311842ff33c5ed5be4b45 100644
--- a/ee/spec/workers/geo/create_repository_updated_event_worker_spec.rb
+++ b/ee/spec/workers/geo/create_repository_updated_event_worker_spec.rb
@@ -32,13 +32,4 @@
       end.to change { ::Geo::Event.where(event_name: :updated).count }.by(1)
     end
   end
-
-  context 'on a Geo secondary site' do
-    it 'does not create a Geo::RepositoryUpdatedEvent' do
-      stub_current_geo_node(secondary_site)
-
-      expect { subject }
-        .not_to change { ::Geo::RepositoryUpdatedEvent.count }
-    end
-  end
 end
diff --git a/ee/spec/workers/geo/prune_event_log_worker_spec.rb b/ee/spec/workers/geo/prune_event_log_worker_spec.rb
index 5e3c4cb39ceb41262b66413a812cc1212e59bfbb..fb0b6e3bee42f5ce9e7112a35b5ed7461e477e35 100644
--- a/ee/spec/workers/geo/prune_event_log_worker_spec.rb
+++ b/ee/spec/workers/geo/prune_event_log_worker_spec.rb
@@ -52,14 +52,14 @@
       end
 
       it 'deletes also associated event table rows' do
-        create_list(:geo_event_log, 2, :updated_event)
+        create_list(:geo_event_log, 2, :geo_event)
         create(:geo_node_status, :healthy, cursor_last_event_id: Geo::EventLog.last.id, geo_node_id: secondary.id)
 
-        expect { worker.perform }.to change { Geo::RepositoryUpdatedEvent.count }.by(-1)
+        expect { worker.perform }.to change { Geo::Event.count }.by(-1)
       end
 
       it 'delegates pruning to Geo::PruneEventLogService' do
-        create(:geo_event_log, :updated_event)
+        create(:geo_event_log, :geo_event)
         create(:geo_node_status, :healthy, cursor_last_event_id: Geo::EventLog.last.id, geo_node_id: secondary.id)
 
         prune_service = spy(:prune_service)
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index d7d862cf8aa004bb103f45b3f21a2f896aadac0d..0e642a5c8d11640d28ad6ba50a0e787fb50e1f6c 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -1668,10 +1668,6 @@
 - './ee/spec/models/geo/pipeline_artifact_registry_spec.rb'
 - './ee/spec/models/geo/push_user_spec.rb'
 - './ee/spec/models/geo/repositories_changed_event_spec.rb'
-- './ee/spec/models/geo/repository_created_event_spec.rb'
-- './ee/spec/models/geo/repository_renamed_event_spec.rb'
-- './ee/spec/models/geo/repository_updated_event_spec.rb'
-- './ee/spec/models/geo/reset_checksum_event_spec.rb'
 - './ee/spec/models/geo/secondary_usage_data_spec.rb'
 - './ee/spec/models/geo/snippet_repository_registry_spec.rb'
 - './ee/spec/models/geo/terraform_state_version_registry_spec.rb'