diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml
index ce4b4c71..a33a1a09 100644
--- a/assets/runtime/config/gitlab-shell/config.yml
+++ b/assets/runtime/config/gitlab-shell/config.yml
@@ -43,7 +43,7 @@ redis:
   host: "{{REDIS_HOST}}"
   port: {{REDIS_PORT}}
   # pass: redispass # Allows you to specify the password for Redis
-  database: 0
+  database: {{REDIS_DB_NUMBER}}
   # socket: /tmp/redis.socket # Only define this if you want to use sockets
   namespace: resque:gitlab
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 44def750..dff3449e 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1140,7 +1140,8 @@ configure_gitlab_shell() {
     GITLAB_SHELL_INSTALL_DIR \
     SSL_SELF_SIGNED \
     REDIS_HOST \
-    REDIS_PORT
+    REDIS_PORT \
+    REDIS_DB_NUMBER
 }
 
 configure_nginx() {