diff --git a/Gemfile b/Gemfile
index 5caae0c2ca9704850c9d7640ddb03af0c6a57616..1264d75eac6299972ec14cb0e389972bf44c027a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
 gem 'sprockets', '~> 3.7.0'
 
 # Default values for AR models
-gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
+gem 'default_value_for', '~> 3.2.0'
 
 # Supported DBs
 gem 'mysql2', '~> 0.4.10', group: :mysql
diff --git a/Gemfile.lock b/Gemfile.lock
index fd366ac16b0a8deff7e7bb935097a1faa2162f9d..5b648d4313798e6ef5fd15b15b36c8f45bb95593 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,6 +163,8 @@ GEM
       html-pipeline
     declarative (0.0.10)
     declarative-option (0.1.0)
+    default_value_for (3.2.0)
+      activerecord (>= 3.2.0, < 6.0)
     derailed_benchmarks (1.3.5)
       benchmark-ips (~> 2)
       get_process_mem (~> 0)
@@ -304,8 +306,6 @@ GEM
     gitaly-proto (1.32.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
-    gitlab-default_value_for (3.1.1)
-      activerecord (>= 3.2.0, < 6.0)
     gitlab-labkit (0.3.0)
       actionpack (~> 5)
       activesupport (~> 5)
@@ -1056,6 +1056,7 @@ DEPENDENCIES
   creole (~> 0.5.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.2.0)
+  default_value_for (~> 3.2.0)
   derailed_benchmarks
   device_detector
   devise (~> 4.6)
@@ -1093,7 +1094,6 @@ DEPENDENCIES
   gettext_i18n_rails_js (~> 1.3)
   gitaly-proto (~> 1.32.0)
   github-markup (~> 1.7.0)
-  gitlab-default_value_for (~> 3.1.1)
   gitlab-labkit (~> 0.3.0)
   gitlab-markup (~> 1.7.0)
   gitlab-sidekiq-fetcher (~> 0.4.0)