diff --git a/README.md b/README.md
index ebf21e2..3267b38 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,8 @@ Image: librenms/librenms:latest
 * `REAL_IP_FROM`: Trusted addresses that are known to send correct replacement addresses (default `0.0.0.0/32`)
 * `REAL_IP_HEADER`: Request header field whose value will be used to replace the client address (default `X-Forwarded-For`)
 * `LOG_IP_VAR`: Use another variable to retrieve the remote IP address for access [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) on Nginx. (default `remote_addr`)
+* `SESSION_DRIVER`: [Driver to use for session storage](https://github.com/librenms/librenms/blob/master/config/session.php) (default `file`)
+* `CACHE_DRIVER`: [Driver to use for cache and locks](https://github.com/librenms/librenms/blob/master/config/cache.php) (default `database`)
 
 ### Redis
 
@@ -135,8 +137,6 @@ Image: librenms/librenms:latest
 * `REDIS_PASSWORD`: Redis password
 * `REDIS_DB`: Redis database (default `0`)
 * `REDIS_CACHE_DB`: Redis cache database (default `1`)
-* `SESSION_DRIVER`: [Driver to use for session storage](https://github.com/librenms/librenms/blob/master/config/session.php) (default `file`)
-* `CACHE_DRIVER`: [Driver to use for cache and locks](https://github.com/librenms/librenms/blob/master/config/cache.php) (default `database`)
 
 ### Dispatcher service
 
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
index 4192133..585cf4c 100644
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@@ -62,9 +62,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
     restart: always
 
   dispatcher:
@@ -91,9 +88,6 @@ services:
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
       - "DISPATCHER_NODE_ID=dispatcher1"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_DISPATCHER=1"
     restart: always
 
@@ -106,6 +100,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 514
         published: 514
@@ -126,9 +121,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SYSLOGNG=1"
     restart: always
 
@@ -141,6 +133,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 162
         published: 162
@@ -161,8 +154,5 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SNMPTRAPD=1"
     restart: always
diff --git a/examples/compose/librenms.env b/examples/compose/librenms.env
index 3494da9..a1d0492 100644
--- a/examples/compose/librenms.env
+++ b/examples/compose/librenms.env
@@ -6,6 +6,10 @@ REAL_IP_FROM=0.0.0.0/32
 REAL_IP_HEADER=X-Forwarded-For
 LOG_IP_VAR=remote_addr
 
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+REDIS_HOST=redis
+
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
 LIBRENMS_WEATHERMAP=false
diff --git a/examples/pwd/librenms.yml b/examples/pwd/librenms.yml
index e2296c7..c22fcc0 100644
--- a/examples/pwd/librenms.yml
+++ b/examples/pwd/librenms.yml
@@ -16,6 +16,9 @@ x-envlibrenms: &envlibrenms
   REAL_IP_FROM: "0.0.0.0/32"
   REAL_IP_HEADER: "X-Forwarded-For"
   LOG_IP_VAR: "remote_addr"
+  CACHE_DRIVER: "redis"
+  SESSION_DRIVER: "redis"
+  REDIS_HOST: "redis"
   LIBRENMS_SNMP_COMMUNITY: "librenmsdocker"
   LIBRENMS_WEATHERMAP: "true"
   LIBRENMS_WEATHERMAP_SCHEDULE: "*/5 * * * *"
@@ -68,9 +71,6 @@ services:
       DB_USER: *MYSQL_USER
       DB_PASSWORD: *MYSQL_PASSWORD
       DB_TIMEOUT: "60"
-      REDIS_HOST: "redis"
-      CACHE_DRIVER: "redis"
-      SESSION_DRIVER: "redis"
     restart: always
 
   dispatcher:
@@ -95,9 +95,6 @@ services:
       DB_PASSWORD: *MYSQL_PASSWORD
       DB_TIMEOUT: "60"
       DISPATCHER_NODE_ID: "dispatcher1234"
-      REDIS_HOST: "redis"
-      CACHE_DRIVER: "redis"
-      SESSION_DRIVER: "redis"
       SIDECAR_DISPATCHER: "1"
     restart: always
 
@@ -123,9 +120,6 @@ services:
       DB_PASSWORD: *MYSQL_PASSWORD
       DB_TIMEOUT: "60"
       DISPATCHER_NODE_ID: "dispatcher5678"
-      REDIS_HOST: "redis"
-      CACHE_DRIVER: "redis"
-      SESSION_DRIVER: "redis"
       SIDECAR_DISPATCHER: "1"
     restart: always
 
@@ -137,6 +131,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     volumes:
       - "librenms:/data"
     environment:
@@ -149,9 +144,6 @@ services:
       DB_USER: *MYSQL_USER
       DB_PASSWORD: *MYSQL_PASSWORD
       DB_TIMEOUT: "60"
-      REDIS_HOST: "redis"
-      CACHE_DRIVER: "redis"
-      SESSION_DRIVER: "redis"
       SIDECAR_SYSLOGNG: "1"
     restart: always
 
diff --git a/examples/rrdcached-server/docker-compose.yml b/examples/rrdcached-server/docker-compose.yml
index c3a21c9..727cdd5 100644
--- a/examples/rrdcached-server/docker-compose.yml
+++ b/examples/rrdcached-server/docker-compose.yml
@@ -80,9 +80,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
     restart: always
 
   dispatcher:
@@ -109,9 +106,6 @@ services:
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
       - "DISPATCHER_NODE_ID=dispatcher1"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_DISPATCHER=1"
     restart: always
 
@@ -124,6 +118,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 514
         published: 514
@@ -144,9 +139,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SYSLOGNG=1"
     restart: always
 
@@ -159,6 +151,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 162
         published: 162
@@ -179,8 +172,5 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SNMPTRAPD=1"
     restart: always
diff --git a/examples/rrdcached-server/librenms.env b/examples/rrdcached-server/librenms.env
index 9424710..44da1f5 100644
--- a/examples/rrdcached-server/librenms.env
+++ b/examples/rrdcached-server/librenms.env
@@ -6,6 +6,10 @@ REAL_IP_FROM=0.0.0.0/32
 REAL_IP_HEADER=X-Forwarded-For
 LOG_IP_VAR=remote_addr
 
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+REDIS_HOST=redis
+
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 RRDCACHED_SERVER=rrdcached:42217
 
diff --git a/examples/traefik/docker-compose.yml b/examples/traefik/docker-compose.yml
index c6c5966..1aedfce 100644
--- a/examples/traefik/docker-compose.yml
+++ b/examples/traefik/docker-compose.yml
@@ -97,9 +97,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
     restart: always
 
   dispatcher:
@@ -123,9 +120,6 @@ services:
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
       - "DISPATCHER_NODE_ID=dispatcher1"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_DISPATCHER=1"
     restart: always
 
@@ -135,6 +129,7 @@ services:
     hostname: librenms-syslogng
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 514
         published: 514
@@ -155,9 +150,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SYSLOGNG=1"
     restart: always
 
@@ -167,6 +159,7 @@ services:
     hostname: librenms-snmptrapd
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 162
         published: 162
@@ -187,8 +180,5 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "CACHE_DRIVER=redis"
-      - "SESSION_DRIVER=redis"
       - "SIDECAR_SNMPTRAPD=1"
     restart: always
diff --git a/examples/traefik/librenms.env b/examples/traefik/librenms.env
index 5627e0d..d650129 100644
--- a/examples/traefik/librenms.env
+++ b/examples/traefik/librenms.env
@@ -6,6 +6,10 @@ REAL_IP_FROM=0.0.0.0/32
 REAL_IP_HEADER=X-Forwarded-For
 LOG_IP_VAR=http_x_forwarded_for
 
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+REDIS_HOST=redis
+
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
 LIBRENMS_WEATHERMAP=false
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index 4438dc7..e4b092c 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -54,9 +54,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "REDIS_PORT=6379"
-      - "REDIS_DB=0"
     restart: always
 
   dispatcher:
@@ -83,9 +80,6 @@ services:
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
       - "DISPATCHER_NODE_ID=dispatcher1"
-      - "REDIS_HOST=redis"
-      - "REDIS_PORT=6379"
-      - "REDIS_DB=0"
       - "SIDECAR_DISPATCHER=1"
     restart: always
 
@@ -98,6 +92,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 514
         published: 514
@@ -118,9 +113,6 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "REDIS_PORT=6379"
-      - "REDIS_DB=0"
       - "SIDECAR_SYSLOGNG=1"
     restart: always
 
@@ -133,6 +125,7 @@ services:
       - NET_RAW
     depends_on:
       - librenms
+      - redis
     ports:
       - target: 162
         published: 162
diff --git a/test/librenms.env b/test/librenms.env
index 3494da9..a1d0492 100644
--- a/test/librenms.env
+++ b/test/librenms.env
@@ -6,6 +6,10 @@ REAL_IP_FROM=0.0.0.0/32
 REAL_IP_HEADER=X-Forwarded-For
 LOG_IP_VAR=remote_addr
 
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+REDIS_HOST=redis
+
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
 LIBRENMS_WEATHERMAP=false