diff --git a/.github/workflows/gempush.yml b/.github/workflows/gempush.yml
index 2fa3bfa0..d6918c78 100644
--- a/.github/workflows/gempush.yml
+++ b/.github/workflows/gempush.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby 3.x
+        uses: ruby/setup-ruby@v1
         with:
-          version: 2.6.x
+          version: 3.2.x
 
       - name: Publish to RubyGems
         run: |
diff --git a/.ruby-version b/.ruby-version
index 6a6a3d8e..be94e6f5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.1
+3.2.2
diff --git a/tasks/databases.rake b/tasks/databases.rake
index 7f23a142..41438e77 100644
--- a/tasks/databases.rake
+++ b/tasks/databases.rake
@@ -46,17 +46,7 @@ namespace :db do
       end
 
       migrations.each do |migration|
-        if migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(migration[:direction], data_migrations_path, migration[:version])
-        else
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(
-            migration[:direction],
-            Rails.application.config.paths["db/migrate"],
-            migration[:version]
-          )
-        end
+        run_migration(migration, migration[:direction])
       end
 
       Rake::Task["db:_dump"].invoke
@@ -91,13 +81,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:up, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:up, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :up)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -119,13 +103,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:down, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:down, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :down)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -189,13 +167,7 @@ namespace :db do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       assure_data_schema_table
       past_migrations[0..(step - 1)].each do | past_migration |
-        if past_migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(:down, data_migrations_path, past_migration[:version])
-        elsif past_migration[:kind] == :schema
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(:down, "db/migrate/", past_migration[:version])
-        end
+        run_migration(past_migration, :down)
       end
 
       Rake::Task["db:_dump"].invoke
@@ -412,3 +384,17 @@ end
 def data_migrations_path
   DataMigrate.config.data_migrations_path
 end
+
+def run_migration(migration, direction)
+  if migration[:kind] == :data
+    ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
+    DataMigrate::DataMigrator.run(direction, data_migrations_path, migration[:version])
+  else
+    ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
+    DataMigrate::SchemaMigration.run(
+      direction,
+      DataMigrate::SchemaMigration.migrations_paths,
+      migration[:version]
+    )
+  end
+end