diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0f42174d6..10c9e288cd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,6 +20,7 @@ jobs:
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+      RAILS_MAX_THREADS: 50
     steps:
       - samvera/cached_checkout
       - samvera/bundle_for_gem:
diff --git a/.regen b/.regen
index 7ed6ff82de..1e8b314962 100644
--- a/.regen
+++ b/.regen
@@ -1 +1 @@
-5
+6
diff --git a/tasks/hyrax_dev.rake b/tasks/hyrax_dev.rake
index a7052e8470..cb1d3aa80c 100644
--- a/tasks/hyrax_dev.rake
+++ b/tasks/hyrax_dev.rake
@@ -46,6 +46,15 @@ if Gem.loaded_specs.key? 'engine_cart'
       puts 'Creating default collection type...'
       EngineCart.within_test_app do
         raise "EngineCart failed on with: #{$?}" unless system "bundle exec rake hyrax:default_collection_types:create"
+
+        # Replace the default sqlite timeout to 15000 (which should triple the timeout). Based on some
+        # googling, this may help address the "ActiveRecord::StatementInvalid:SQLite3::BusyException:"
+        # exception that is occassionally breaking the build.
+        database_yml_content = File.read("config/database.yml")
+        new_database_yml_content = database_yml_content.gsub(/timeout: +(\d+)/, 'timeout: 15000')
+        File.open("config/database.yml", "w+") do |f|
+          f.puts new_database_yml_content
+        end
       end
     end
   end