diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index d38e7e59..834db28a 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 2.7
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml
index 0bec99d1..d22991cc 100644
--- a/.github/workflows/migrations.yml
+++ b/.github/workflows/migrations.yml
@@ -44,7 +44,7 @@ jobs:
       # Install ruby
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 2.7
 
       # Retrieve gem cache for merge commit parent
       - uses: actions/cache@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 64ec0589..302e77ed 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 2.7
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
diff --git a/.ruby-version b/.ruby-version
index 6a6a3d8e..37c2961c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.1
+2.7.2
diff --git a/Gemfile b/Gemfile
index 604c4071..66fa7e85 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ gem 'bootstrap-sass'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 
-
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
diff --git a/config/puma.rb b/config/puma.rb
index 8a49361e..a060aaa9 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -89,3 +89,10 @@
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
+
+# Call GC.start and GC.compact before forking to try to reduce worker memory usage
+nakayoshi_fork
+
+# Adds a small delay before accepting requests if the worker (process) has threads already
+# processing other requests, to try to get idle workers to accept the request
+wait_for_less_busy_worker ENV.fetch('WAIT_FOR_LESS_BUSY_WORKERS', '0.005').to_f