diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d203dba..b8179e8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The **patch** part changes incrementally at each release.
 * php: variable to install the mysqlnd module instead of the default mysql module
 * packweb-apache: Deploy opcache.php to give some insights on PHP's opcache status
 * webapps/evoadmin-web Overload templates if needed
+* redis: max clients is configurable
 
 ### Changed
 * elasticsearch: listen on local interface only by default
diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml
index cb8d451d..97117651 100644
--- a/redis/defaults/main.yml
+++ b/redis/defaults/main.yml
@@ -29,6 +29,8 @@ redis_rdbcompression: "yes"
 redis_dbfilename: dump.rdb
 redis_dbdir: /var/lib/redis
 
+redis_maxclients: 128
+
 redis_maxmemory: 0
 redis_maxmemory_policy: "noeviction"
 redis_maxmemory_samples: 5
diff --git a/redis/templates/redis.conf.j2 b/redis/templates/redis.conf.j2
index f2f17c70..ab4f493e 100644
--- a/redis/templates/redis.conf.j2
+++ b/redis/templates/redis.conf.j2
@@ -40,7 +40,9 @@ dir {{ redis_dbdir }}
 protected-mode {{ redis_protected_mode }}
 {% endif %}
 
-# maxclients 128
+{% if redis_maxclients %}
+maxclients {{ redis_maxclients }}
+{% endif %}
 
 {% if redis_maxmemory %}
 maxmemory {{ redis_maxmemory }}