diff --git a/6.2/Dockerfile b/6.2/Dockerfile
index ec95d18..896bc02 100644
--- a/6.2/Dockerfile
+++ b/6.2/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=redis.local
+ENV REDIS_ARGS='--databases 1000'
 
 # Install system packages
 RUN apt-get update -yqqq && \
diff --git a/6.2/config/supervisor/redis.conf b/6.2/config/supervisor/redis.conf
index f65564d..06920bb 100644
--- a/6.2/config/supervisor/redis.conf
+++ b/6.2/config/supervisor/redis.conf
@@ -1,7 +1,7 @@
 [program:redis]
 priority=20
 directory=/tmp
-command=/usr/local/bin/docker-entrypoint.sh redis-server
+command=/usr/local/bin/docker-entrypoint.sh redis-server %(ENV_REDIS_ARGS)s
 user=root
 autostart=true
 autorestart=true
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index dc42e5f..7d0965b 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=redis.local
+ENV REDIS_ARGS='--databases 1000'
 
 # Install system packages
 RUN apt-get update -yqqq && \
diff --git a/7.0/config/supervisor/redis.conf b/7.0/config/supervisor/redis.conf
index f65564d..06920bb 100644
--- a/7.0/config/supervisor/redis.conf
+++ b/7.0/config/supervisor/redis.conf
@@ -1,7 +1,7 @@
 [program:redis]
 priority=20
 directory=/tmp
-command=/usr/local/bin/docker-entrypoint.sh redis-server
+command=/usr/local/bin/docker-entrypoint.sh redis-server %(ENV_REDIS_ARGS)s
 user=root
 autostart=true
 autorestart=true
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
index 78cf700..acc8b17 100644
--- a/7.2/Dockerfile
+++ b/7.2/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=redis.local
+ENV REDIS_ARGS='--databases 1000'
 
 # Install system packages
 RUN apt-get update -yqqq && \
diff --git a/7.2/config/supervisor/redis.conf b/7.2/config/supervisor/redis.conf
index f65564d..06920bb 100644
--- a/7.2/config/supervisor/redis.conf
+++ b/7.2/config/supervisor/redis.conf
@@ -1,7 +1,7 @@
 [program:redis]
 priority=20
 directory=/tmp
-command=/usr/local/bin/docker-entrypoint.sh redis-server
+command=/usr/local/bin/docker-entrypoint.sh redis-server %(ENV_REDIS_ARGS)s
 user=root
 autostart=true
 autorestart=true
diff --git a/README.md b/README.md
index a31129c..66b805c 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,8 @@ redis:
   environment:
     # Mind the .local suffix
     - MDNS_HOSTNAME=redis.test.local
+    # We allow additional redis-server arguments via: (default)
+    - REDIS_ARGS="--databases 1000"
   ports:
     # The ports are just for you to know when configure your
     # container links, on depended containers
diff --git a/config/supervisor/redis.conf b/config/supervisor/redis.conf
index f65564d..06920bb 100644
--- a/config/supervisor/redis.conf
+++ b/config/supervisor/redis.conf
@@ -1,7 +1,7 @@
 [program:redis]
 priority=20
 directory=/tmp
-command=/usr/local/bin/docker-entrypoint.sh redis-server
+command=/usr/local/bin/docker-entrypoint.sh redis-server %(ENV_REDIS_ARGS)s
 user=root
 autostart=true
 autorestart=true