diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6221e1c2..9e549ff9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## x.x.x (Month Day, Year)
 
 #### Fixes
+* Update of the roles, roles mappings and users will not trigger service restart (if enabled).
 
 #### Features
 
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 483369729..3969c9d52 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -31,3 +31,4 @@ Rhommel Lamas (rhoml)
 Jose Luis Ledesma (sp-joseluis-ledesma)
 Matthias Baur (baurmatt)
 Gavin Williams (fatmcgav)
+Luca Belluccini (lucabelluccini)
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 5bdac8646..e6ecbdfc3 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -365,6 +365,10 @@
         "${elasticsearch::configdir}/jvm.options",
         "${elasticsearch::configdir}/logging.yml",
         "${elasticsearch::configdir}/log4j2.properties",
+        "${elasticsearch::configdir}/users",
+        "${elasticsearch::configdir}/users_roles",
+        "${elasticsearch::configdir}/roles.yml",
+        "${elasticsearch::configdir}/role_mapping.yml",
       ],
       recurse      => 'remote',
       recurselimit => 1,
@@ -378,6 +382,38 @@
       before       => Elasticsearch::Service[$name],
       notify       => $notify_service,
     }
+    file { "${configdir}/users_roles":
+      ensure  => 'file',
+      source  => "${elasticsearch::configdir}/users_roles",
+      purge   => $elasticsearch::purge_configdir,
+      force   => $elasticsearch::purge_configdir,
+      require => File[$configdir],
+      before  => Elasticsearch::Service[$name],
+    }
+    file { "${configdir}/roles.yml":
+      ensure  => 'file',
+      source  => "${elasticsearch::configdir}/roles.yml",
+      purge   => $elasticsearch::purge_configdir,
+      force   => $elasticsearch::purge_configdir,
+      require => File[$configdir],
+      before  => Elasticsearch::Service[$name],
+    }
+    file { "${configdir}/role_mapping.yml":
+      ensure  => 'file',
+      source  => "${elasticsearch::configdir}/role_mapping.yml",
+      purge   => $elasticsearch::purge_configdir,
+      force   => $elasticsearch::purge_configdir,
+      require => File[$configdir],
+      before  => Elasticsearch::Service[$name],
+    }
+    file { "${configdir}/users":
+      ensure  => 'file',
+      source  => "${elasticsearch::configdir}/users",
+      purge   => $elasticsearch::purge_configdir,
+      force   => $elasticsearch::purge_configdir,
+      require => File[$configdir],
+      before  => Elasticsearch::Service[$name],
+    }
 
     # Do _not_ copy in instance directories. This avoids a) recursing
     # indefinitely by copying our own instance directory and b) copying in any