diff --git a/config.py b/config.py
index 6427076..a4a2223 100644
--- a/config.py
+++ b/config.py
@@ -53,6 +53,7 @@ SQLALCHEMY_DATABASE_URI = environ.get('PROXSTAR_SQLALCHEMY_DATABASE_URI', '')
 
 # REDIS
 REDIS_HOST = environ.get('PROXSTAR_REDIS_HOST', 'localhost')
+RQ_DASHBOARD_REDIS_HOST = environ.get('PROXSTAR_REDIS_HOST', 'localhost')
 REDIS_PORT = int(environ.get('PROXSTAR_REDIS_PORT', '6379'))
 
 # VNC
diff --git a/proxstar/__init__.py b/proxstar/__init__.py
index 7df895d..1ff7818 100644
--- a/proxstar/__init__.py
+++ b/proxstar/__init__.py
@@ -59,7 +59,7 @@ ssh_tunnels = []
 auth = get_auth(app)
 
 redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT'])
-q = Queue(connection=redis_conn)
+q = Queue(connection=redis_conn, default_timeout=360)
 scheduler = Scheduler(connection=redis_conn)
 
 engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI'])
diff --git a/rqsettings.py b/rqsettings.py
index 1f0cc7f..31786d8 100644
--- a/rqsettings.py
+++ b/rqsettings.py
@@ -2,6 +2,7 @@ import os
 
 import sentry_sdk
 from sentry_sdk.integrations.rq import RqIntegration
+from sentry_sdk.integrations.redis import RedisIntegration
 
 if os.path.exists('config_local.py'):
     import config_local as config
@@ -10,6 +11,6 @@ else:
 
 sentry_sdk.init(
     config.SENTRY_DSN,
-    integrations=[RqIntegration()],
-    environment=config.SENTRY_ENV
+    integrations=[RqIntegration(), RedisIntegration()],
+    environment=config.SENTRY_ENV,
 )