diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index 0d572d2..fbb0235 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -8,9 +8,7 @@ COPY ./docker/credentials.py ./website/settings
 COPY ./docker/start.sh ./docker/start-test.sh ./docker/wait-for-it.sh ./
 
 RUN /install.sh web \
-    && chmod +x ./*.sh \
-    && sed s/'@localhost'/'@rabbitmq'/g ./website/settings/common.py > tmp \
-    && mv tmp ./website/settings/common.py
+    && chmod +x ./*.sh
 
 ENV DJANGO_SETTINGS_MODULE=website.settings
 ENV C_FORCE_ROOT=true
diff --git a/docker/credentials.py b/docker/credentials.py
index f5d165f..e23eb6b 100644
--- a/docker/credentials.py
+++ b/docker/credentials.py
@@ -4,6 +4,7 @@ import string
 from os import environ as env
 
 debug = env.get('DEBUG', 'true').lower() == 'true'
+rabbitmq_host = env.get('RABBITMQ_HOST', 'rabbitmq')
 backend = env.get('BACKEND', 'postgresql')
 db_name = env.get('DB_NAME', 'ottertune')
 db_host = env.get('DB_HOST', 'localhost')
@@ -41,3 +42,4 @@ DEBUG = debug
 ADMINS = ()
 MANAGERS = ADMINS
 ALLOWED_HOSTS = ['*']
+BROKER_URL = 'amqp://guest:guest@{}:5672//'.format(rabbitmq_host)
diff --git a/docker/docker-compose.up.yml b/docker/docker-compose.up.yml
index b34edd3..c1589db 100644
--- a/docker/docker-compose.up.yml
+++ b/docker/docker-compose.up.yml
@@ -25,6 +25,7 @@ services:
           DB_PORT: '5432'
           DB_OPTS: '{}'
           MAX_DB_CONN_ATTEMPTS: 30
+          RABBITMQ_HOST: 'rabbitmq'
         working_dir: /app/website
         entrypoint: ./start.sh
         labels: