diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index c8d4c77714..8c22c022be 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -94,9 +94,9 @@ module.exports = settings =
 			maxRetriesPerRequest: parseInt(process.env["REDIS_MAX_RETRIES_PER_REQUEST"] || '20')
 
 		queues:
-			host: process.env['QUEUES_REDIS_HOST'] || process.env['REDIS_HOST'] || 'localhost'
-			port: process.env['QUEUES_REDIS_PORT'] || process.env['REDIS_PORT'] || '6379'
-			password: process.env['QUEUES_REDIS_PASSWORD'] || process.env['REDIS_PASSWORD'] || ''
+			host: process.env['QUEUES_REDIS_HOST'] || 'localhost'
+			port: process.env['QUEUES_REDIS_PORT'] || '6379'
+			password: process.env['QUEUES_REDIS_PASSWORD'] || ''
 
 	# Service locations
 	# -----------------
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 13a10b7fbc..cb810c45d3 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -20,6 +20,7 @@ services:
     environment:
       BCRYPT_ROUNDS: 1
       REDIS_HOST: redis
+      QUEUES_REDIS_HOST: redis
       MONGO_URL: "mongodb://mongo/sharelatex"
       SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'
       PROJECT_HISTORY_ENABLED: 'true'
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index c0c4613553..b731d1f299 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -26,6 +26,7 @@ services:
     environment:
       BCRYPT_ROUNDS: 1
       REDIS_HOST: redis
+      QUEUES_REDIS_HOST: redis
       MONGO_URL: "mongodb://mongo/sharelatex"
       SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'
       PROJECT_HISTORY_ENABLED: 'true'