diff --git a/lib/puppet/type/elasticsearch_role.rb b/lib/puppet/type/elasticsearch_role.rb
index ae129bb..2248ab5 100644
--- a/lib/puppet/type/elasticsearch_role.rb
+++ b/lib/puppet/type/elasticsearch_role.rb
@@ -1,15 +1,15 @@
 Puppet::Type.newtype(:elasticsearch_role) do
   desc 'Type to model Elasticsearch roles.'
 
   ensurable
 
   newparam(:name, :namevar => true) do
     desc 'Role name.'
 
-    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,29}$/)
+    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,39}$/)
   end
 
   newproperty(:privileges) do
     desc 'Security privileges of the given role.'
   end
 end
diff --git a/lib/puppet/type/elasticsearch_role_mapping.rb b/lib/puppet/type/elasticsearch_role_mapping.rb
index 4a52bda..6bc669c 100644
--- a/lib/puppet/type/elasticsearch_role_mapping.rb
+++ b/lib/puppet/type/elasticsearch_role_mapping.rb
@@ -1,15 +1,15 @@
 Puppet::Type.newtype(:elasticsearch_role_mapping) do
   desc 'Type to model Elasticsearch role mappings.'
 
   ensurable
 
   newparam(:name, :namevar => true) do
     desc 'Role name.'
 
-    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,29}$/)
+    newvalues(/^[a-zA-Z_]{1}[-\w@.$]{0,39}$/)
   end
 
   newproperty(:mappings, :array_matching => :all) do
     desc 'List of role mappings.'
   end
 end
diff --git a/manifests/role.pp b/manifests/role.pp
index d2fe507..79a63c5 100644
--- a/manifests/role.pp
+++ b/manifests/role.pp
@@ -1,58 +1,58 @@
 # Manage x-pack roles.
 #
 # @param ensure
 #   Whether the role should be present or not.
 #   Set to 'absent' to ensure a role is not present.
 #
 # @param mappings
 #   A list of optional mappings defined for this role.
 #
 # @param privileges
 #   A hash of permissions defined for the role. Valid privilege settings can
 #   be found in the x-pack documentation.
 #
 # @example create and manage the role 'power_user' mapped to an LDAP group.
 #   elasticsearch::role { 'power_user':
 #     privileges => {
 #       'cluster' => 'monitor',
 #       'indices' => {
 #         '*' => 'all',
 #       },
 #     },
 #     mappings => [
 #       "cn=users,dc=example,dc=com",
 #     ],
 #   }
 #
 # @author Tyler Langlois <tyler.langlois@elastic.co>
 # @author Gavin Williams <gavin.williams@elastic.co>
 #
 define elasticsearch::role (
   Enum['absent', 'present'] $ensure     = 'present',
   Array                     $mappings   = [],
   Hash                      $privileges = {},
 ) {
-  validate_slength($name, 30, 1)
+  validate_slength($name, 40, 1)
 
   if empty($privileges) or $ensure == 'absent' {
     $_role_ensure = 'absent'
   } else {
     $_role_ensure = $ensure
   }
 
   if empty($mappings) or $ensure == 'absent' {
     $_mapping_ensure = 'absent'
   } else {
     $_mapping_ensure = $ensure
   }
 
   elasticsearch_role { $name :
     ensure     => $_role_ensure,
     privileges => $privileges,
   }
 
   elasticsearch_role_mapping { $name :
     ensure   => $_mapping_ensure,
     mappings => $mappings,
   }
 }