diff --git a/Gemfile b/Gemfile
index 19a8772529..259e59200e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby File.read('.ruby-version').chomp
 
-gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+gem 'dotenv', require: 'dotenv/load' # Load ENV vars before other gems
 
 gem 'rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a269b03df..d7f53aa31c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -258,10 +258,7 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.1)
     docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
+    dotenv (3.0.0)
     email_validator (2.2.4)
       activemodel
     erubi (1.12.0)
@@ -414,7 +411,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.1)
+    minitest (5.22.2)
     monetize (1.13.0)
       money (~> 6.12)
     money (6.16.0)
@@ -846,7 +843,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   digest
-  dotenv-rails
+  dotenv
   factory_bot_rails (= 6.2.0)
   faraday
   ffaker