diff --git a/files/gitlab-cookbooks/consul/recipes/enable.rb b/files/gitlab-cookbooks/consul/recipes/enable.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9jb25zdWwvcmVjaXBlcy9lbmFibGUucmI=..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9jb25zdWwvcmVjaXBlcy9lbmFibGUucmI= 100644
--- a/files/gitlab-cookbooks/consul/recipes/enable.rb
+++ b/files/gitlab-cookbooks/consul/recipes/enable.rb
@@ -28,7 +28,7 @@
   groupname account_helper.consul_group
   gid node['consul']['gid']
   home node['consul']['dir']
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
 
 directory node['consul']['dir'] do
diff --git a/files/gitlab-cookbooks/gitlab-ee/resources/sentinel_service.rb b/files/gitlab-cookbooks/gitlab-ee/resources/sentinel_service.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVzb3VyY2VzL3NlbnRpbmVsX3NlcnZpY2UucmI=..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVzb3VyY2VzL3NlbnRpbmVsX3NlcnZpY2UucmI= 100644
--- a/files/gitlab-cookbooks/gitlab-ee/resources/sentinel_service.rb
+++ b/files/gitlab-cookbooks/gitlab-ee/resources/sentinel_service.rb
@@ -31,7 +31,7 @@
     gid node['redis']['gid']
     shell node['redis']['shell']
     home node['redis']['home']
-    manage node['gitlab']['manage-accounts']['enable']
+    manage node['gitlab']['manage_accounts']['enable']
   end
 
   directory new_resource.sentinel_configuration['dir'] do
diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -21,7 +21,7 @@
 ####
 default['gitlab']['bootstrap']['enable'] = true
 # Create users and groups needed for the package
-default['gitlab']['manage-accounts']['enable'] = true
+default['gitlab']['manage_accounts']['enable'] = true
 
 # Create directories with correct permissions and ownership required by the pkg
 default['gitlab']['manage-storage-directories']['enable'] = true
diff --git a/files/gitlab-cookbooks/gitlab/recipes/remove_accounts.rb b/files/gitlab-cookbooks/gitlab/recipes/remove_accounts.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9yZW1vdmVfYWNjb3VudHMucmI=..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9yZW1vdmVfYWNjb3VudHMucmI= 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/remove_accounts.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/remove_accounts.rb
@@ -27,7 +27,7 @@
   account username do
     username username
     action :remove
-    manage node['gitlab']['manage-accounts']['enable']
+    manage node['gitlab']['manage_accounts']['enable']
   end
 end
 
@@ -35,6 +35,6 @@
   account group do
     groupname group
     action :remove
-    manage node['gitlab']['manage-accounts']['enable']
+    manage node['gitlab']['manage_accounts']['enable']
   end
 end
diff --git a/files/gitlab-cookbooks/gitlab/recipes/users.rb b/files/gitlab-cookbooks/gitlab/recipes/users.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy91c2Vycy5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy91c2Vycy5yYg== 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/users.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/users.rb
@@ -33,7 +33,7 @@
   gid node['gitlab']['user']['gid']
   shell node['gitlab']['user']['shell']
   home gitlab_home
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
 
 # Configure Git settings for the GitLab user
diff --git a/files/gitlab-cookbooks/gitlab/recipes/web-server.rb b/files/gitlab-cookbooks/gitlab/recipes/web-server.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy93ZWItc2VydmVyLnJi..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy93ZWItc2VydmVyLnJi 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/web-server.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/web-server.rb
@@ -35,5 +35,5 @@
   append_to_group external_webserver_users.any?
   group_members external_webserver_users
   manage_home false
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
diff --git a/files/gitlab-cookbooks/mattermost/recipes/enable.rb b/files/gitlab-cookbooks/mattermost/recipes/enable.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L3JlY2lwZXMvZW5hYmxlLnJi..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L3JlY2lwZXMvZW5hYmxlLnJi 100644
--- a/files/gitlab-cookbooks/mattermost/recipes/enable.rb
+++ b/files/gitlab-cookbooks/mattermost/recipes/enable.rb
@@ -43,7 +43,7 @@
   gid mattermost_gid
   shell '/bin/sh'
   home mattermost_home
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
 
 ###
diff --git a/files/gitlab-cookbooks/monitoring/recipes/user.rb b/files/gitlab-cookbooks/monitoring/recipes/user.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tb25pdG9yaW5nL3JlY2lwZXMvdXNlci5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tb25pdG9yaW5nL3JlY2lwZXMvdXNlci5yYg== 100644
--- a/files/gitlab-cookbooks/monitoring/recipes/user.rb
+++ b/files/gitlab-cookbooks/monitoring/recipes/user.rb
@@ -27,5 +27,5 @@
   home prometheus_dir
   gid node['monitoring']['prometheus']['gid']
   shell node['monitoring']['prometheus']['shell']
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
diff --git a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2wucmI=..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2wucmI= 100644
--- a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb
+++ b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb
@@ -53,6 +53,7 @@
     registry_external_url
     gitlab_ci
     high_availability
+    manage_accounts
   ].freeze
 
   def self.extended(base)
diff --git a/files/gitlab-cookbooks/postgresql/recipes/user.rb b/files/gitlab-cookbooks/postgresql/recipes/user.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wb3N0Z3Jlc3FsL3JlY2lwZXMvdXNlci5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wb3N0Z3Jlc3FsL3JlY2lwZXMvdXNlci5yYg== 100644
--- a/files/gitlab-cookbooks/postgresql/recipes/user.rb
+++ b/files/gitlab-cookbooks/postgresql/recipes/user.rb
@@ -27,7 +27,7 @@
   gid node['postgresql']['gid']
   shell node['postgresql']['shell']
   home node['postgresql']['home']
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
 
 directory node['postgresql']['home'] do
diff --git a/files/gitlab-cookbooks/redis/resources/service.rb b/files/gitlab-cookbooks/redis/resources/service.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9yZWRpcy9yZXNvdXJjZXMvc2VydmljZS5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9yZWRpcy9yZXNvdXJjZXMvc2VydmljZS5yYg== 100644
--- a/files/gitlab-cookbooks/redis/resources/service.rb
+++ b/files/gitlab-cookbooks/redis/resources/service.rb
@@ -18,7 +18,7 @@
     gid node['redis']['gid']
     shell node['redis']['shell']
     home node['redis']['home']
-    manage node['gitlab']['manage-accounts']['enable']
+    manage node['gitlab']['manage_accounts']['enable']
   end
 
   group 'Socket group' do
diff --git a/files/gitlab-cookbooks/registry/recipes/enable.rb b/files/gitlab-cookbooks/registry/recipes/enable.rb
index 7231f9d201299daf811b43a476b26958ce643a40_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9yZWdpc3RyeS9yZWNpcGVzL2VuYWJsZS5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9yZWdpc3RyeS9yZWNpcGVzL2VuYWJsZS5yYg== 100644
--- a/files/gitlab-cookbooks/registry/recipes/enable.rb
+++ b/files/gitlab-cookbooks/registry/recipes/enable.rb
@@ -37,7 +37,7 @@
   gid registry_gid
   shell '/bin/sh'
   home working_dir
-  manage node['gitlab']['manage-accounts']['enable']
+  manage node['gitlab']['manage_accounts']['enable']
 end
 
 directory "create #{working_dir} and set the owner" do
diff --git a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb
index 7231f9d201299daf811b43a476b26958ce643a40_c3BlYy9jaGVmL2Nvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2xfc3BlYy5yYg==..1aea102d8581b1a08057d11742e6c53b528219bc_c3BlYy9jaGVmL2Nvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2xfc3BlYy5yYg== 100644
--- a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb
+++ b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb
@@ -49,6 +49,7 @@
         %w[registry-external-url registry_external_url],
         %w[gitlab-ci gitlab_ci],
         %w[high-availability high_availability],
+        %w[manage-accounts manage_accounts],
       ].each do |input, output|
         expect(subject.sanitized_key(input)).to eq(output)
       end