diff --git a/.github/workflows/aggregate_root_test.yml b/.github/workflows/aggregate_root_test.yml
index 0d587e73b7..5712762156 100644
--- a/.github/workflows/aggregate_root_test.yml
+++ b/.github/workflows/aggregate_root_test.yml
@@ -49,8 +49,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/dres_client_test.yml b/.github/workflows/dres_client_test.yml
index 9feddb1b91..ec373d1689 100644
--- a/.github/workflows/dres_client_test.yml
+++ b/.github/workflows/dres_client_test.yml
@@ -41,8 +41,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/dres_rails_test.yml b/.github/workflows/dres_rails_test.yml
index 4c262d7d69..ac53946ee0 100644
--- a/.github/workflows/dres_rails_test.yml
+++ b/.github/workflows/dres_rails_test.yml
@@ -66,10 +66,6 @@ jobs:
           bundle_gemfile: Gemfile
           database_url: postgres://postgres:secret@localhost:10015/rails_event_store
           data_type: binary
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: postgres://postgres:secret@localhost:10015/rails_event_store
-          data_type: binary
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile
           database_url: postgres://postgres:secret@localhost:10011/rails_event_store
diff --git a/.github/workflows/minitest-ruby_event_store_test.yml b/.github/workflows/minitest-ruby_event_store_test.yml
index 3a71f4f27e..731dffd318 100644
--- a/.github/workflows/minitest-ruby_event_store_test.yml
+++ b/.github/workflows/minitest-ruby_event_store_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/rails_event_store_test.yml b/.github/workflows/rails_event_store_test.yml
index 3b1b845442..1bd30d7682 100644
--- a/.github/workflows/rails_event_store_test.yml
+++ b/.github/workflows/rails_event_store_test.yml
@@ -49,8 +49,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.rails_7_0
         - ruby_version: ruby-3.3
diff --git a/.github/workflows/ruby_event_store-active_record_test.yml b/.github/workflows/ruby_event_store-active_record_test.yml
index 429396e9fb..cb0a24314d 100644
--- a/.github/workflows/ruby_event_store-active_record_test.yml
+++ b/.github/workflows/ruby_event_store-active_record_test.yml
@@ -90,10 +90,6 @@ jobs:
           bundle_gemfile: Gemfile
           database_url: sqlite3:db.sqlite3
           data_type: binary
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: sqlite3:db.sqlite3
-          data_type: binary
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.activerecord_7_0
           database_url: sqlite3:db.sqlite3
diff --git a/.github/workflows/ruby_event_store-browser_test.yml b/.github/workflows/ruby_event_store-browser_test.yml
index ab82652d76..b40e7a7dc3 100644
--- a/.github/workflows/ruby_event_store-browser_test.yml
+++ b/.github/workflows/ruby_event_store-browser_test.yml
@@ -49,8 +49,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.rack_2_0
     steps:
diff --git a/.github/workflows/ruby_event_store-flipper_test.yml b/.github/workflows/ruby_event_store-flipper_test.yml
index 6b8466d6dc..4409a1525e 100644
--- a/.github/workflows/ruby_event_store-flipper_test.yml
+++ b/.github/workflows/ruby_event_store-flipper_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.activesupport_7_0
         - ruby_version: ruby-3.3
diff --git a/.github/workflows/ruby_event_store-newrelic_test.yml b/.github/workflows/ruby_event_store-newrelic_test.yml
index 8f8d52a7b4..0d65d756c5 100644
--- a/.github/workflows/ruby_event_store-newrelic_test.yml
+++ b/.github/workflows/ruby_event_store-newrelic_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/ruby_event_store-outbox_test.yml b/.github/workflows/ruby_event_store-outbox_test.yml
index 5b5dbfd21a..1c2d747d44 100644
--- a/.github/workflows/ruby_event_store-outbox_test.yml
+++ b/.github/workflows/ruby_event_store-outbox_test.yml
@@ -60,9 +60,6 @@ jobs:
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
           database_url: sqlite3:db.sqlite3
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: sqlite3:db.sqlite3
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.rails_7_0
           database_url: sqlite3:db.sqlite3
@@ -73,7 +70,7 @@ jobs:
           bundle_gemfile: Gemfile.rails_6_0
           database_url: sqlite3:db.sqlite3
         - ruby_version: ruby-3.3
-          bundle_gemfile: Gemfile.sidekiq_6_5
+          bundle_gemfile: Gemfile.sidekiq_5_2
           database_url: sqlite3:db.sqlite3
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile
diff --git a/.github/workflows/ruby_event_store-profiler_test.yml b/.github/workflows/ruby_event_store-profiler_test.yml
index 2bab0e41ee..e4d402df29 100644
--- a/.github/workflows/ruby_event_store-profiler_test.yml
+++ b/.github/workflows/ruby_event_store-profiler_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/ruby_event_store-protobuf_test.yml b/.github/workflows/ruby_event_store-protobuf_test.yml
index ed96506bc4..8f2ef6dd06 100644
--- a/.github/workflows/ruby_event_store-protobuf_test.yml
+++ b/.github/workflows/ruby_event_store-protobuf_test.yml
@@ -40,9 +40,6 @@ jobs:
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
           database_url: sqlite3:db.sqlite3
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: sqlite3:db.sqlite3
         - ruby_version: ruby-3.2
           bundle_gemfile: Gemfile.rails_7_0
           database_url: sqlite3:db.sqlite3
diff --git a/.github/workflows/ruby_event_store-rom_test.yml b/.github/workflows/ruby_event_store-rom_test.yml
index beefa629d5..150ba1c921 100644
--- a/.github/workflows/ruby_event_store-rom_test.yml
+++ b/.github/workflows/ruby_event_store-rom_test.yml
@@ -80,10 +80,6 @@ jobs:
           bundle_gemfile: Gemfile
           database_url: sqlite:db.sqlite3
           data_type: text
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: sqlite:db.sqlite3
-          data_type: text
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile
           database_url: postgres://postgres:secret@localhost:10015/rails_event_store
diff --git a/.github/workflows/ruby_event_store-rspec_test.yml b/.github/workflows/ruby_event_store-rspec_test.yml
index 328fde86c7..93c9f95bfb 100644
--- a/.github/workflows/ruby_event_store-rspec_test.yml
+++ b/.github/workflows/ruby_event_store-rspec_test.yml
@@ -49,8 +49,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/ruby_event_store-sequel_test.yml b/.github/workflows/ruby_event_store-sequel_test.yml
index f5fb915da3..78156d99f1 100644
--- a/.github/workflows/ruby_event_store-sequel_test.yml
+++ b/.github/workflows/ruby_event_store-sequel_test.yml
@@ -80,10 +80,6 @@ jobs:
           bundle_gemfile: Gemfile
           database_url: sqlite:db.sqlite3
           data_type: text
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
-          database_url: sqlite:db.sqlite3
-          data_type: text
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile
           database_url: postgres://postgres:secret@localhost:10015/rails_event_store
diff --git a/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml b/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
index 716473926b..dd60988924 100644
--- a/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
+++ b/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
         - ruby_version: ruby-3.3
           bundle_gemfile: Gemfile.sidekiq_6_5
         - ruby_version: ruby-3.3
diff --git a/.github/workflows/ruby_event_store-transformations_test.yml b/.github/workflows/ruby_event_store-transformations_test.yml
index a324707768..16c309eb80 100644
--- a/.github/workflows/ruby_event_store-transformations_test.yml
+++ b/.github/workflows/ruby_event_store-transformations_test.yml
@@ -39,8 +39,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/ruby_event_store_test.yml b/.github/workflows/ruby_event_store_test.yml
index 1886476ee2..73026a99f9 100644
--- a/.github/workflows/ruby_event_store_test.yml
+++ b/.github/workflows/ruby_event_store_test.yml
@@ -49,8 +49,6 @@ jobs:
           bundle_gemfile: Gemfile
         - ruby_version: ruby-3.1
           bundle_gemfile: Gemfile
-        - ruby_version: ruby-3.0
-          bundle_gemfile: Gemfile
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/support/ci/generate b/support/ci/generate
index 728fc68c7f..f422ac7eaa 100755
--- a/support/ci/generate
+++ b/support/ci/generate
@@ -15,8 +15,7 @@ class CI
     MRI_RUBY = [
       RUBY_3_3 = "ruby-3.3",
       RUBY_3_2 = "ruby-3.2",
-      RUBY_3_1 = "ruby-3.1",
-      RUBY_3_0 = "ruby-3.0"
+      RUBY_3_1 = "ruby-3.1"
     ]
   ].flatten