diff --git a/deployment/puppet/galera/manifests/params.pp b/deployment/puppet/galera/manifests/params.pp
index 96e1e80fe2..6dd4f4e2ef 100644
--- a/deployment/puppet/galera/manifests/params.pp
+++ b/deployment/puppet/galera/manifests/params.pp
@@ -29,8 +29,7 @@ class galera::params {
     inline_template("<%= [(${buffer_size} * 0.2 + 0).floor, 2047].min %>M")
   $wait_timeout            = '1800'
   $myisam_sort_buffer_size = '64M'
-  $key_buffer_size_mb      = '64'
-  $key_buffer_size         = "${key_buffer_size_mb}M"
+  $key_buffer_size         = '64'
   $table_open_cache        = '10000'
   $open_files_limit        = '102400'
   $innodb_flush_method     = 'O_DIRECT'
@@ -38,8 +37,8 @@ class galera::params {
   $sort_buffer_size_mb     = '0.25'
   $read_buffer_size_mb     = '0.125'
   $max_connections = inline_template(
-    "<%= [[((${::memorysize_mb} * 0.3 - ${key_buffer_size_mb}) /
-    (${sort_buffer_size_mb} + ${read_buffer_size_mb})).floor, 8192].min, 1000].max %>")
+    "<%= [[((${::memorysize_mb} * 0.3 - ${key_buffer_size}) /
+    (${sort_buffer_size_mb} + ${read_buffer_size_mb})).floor, 8192].min, 2048].max %>")
 
   if ($::galera::use_percona) {
     case $::osfamily {
diff --git a/deployment/puppet/galera/templates/wsrep.cnf.erb b/deployment/puppet/galera/templates/wsrep.cnf.erb
index 9e01cb21e5..a4ff1063a7 100644
--- a/deployment/puppet/galera/templates/wsrep.cnf.erb
+++ b/deployment/puppet/galera/templates/wsrep.cnf.erb
@@ -24,7 +24,7 @@ myisam_sort_buffer_size=<%= @myisam_sort_buffer_size %>
 wait_timeout=<%= @wait_timeout %>
 open_files_limit=<%= @open_files_limit %>
 table_open_cache=<%= @table_open_cache %>
-key_buffer_size=<%= @key_buffer_size %>
+key_buffer_size=<%= @key_buffer_size %>M
 max_allowed_packet=256M
 query_cache_size=0
 query_cache_type=0