diff --git a/celeryconfig.py b/celeryconfig.py
deleted file mode 100644
--- a/celeryconfig.py
+++ /dev/null
@@ -1,4 +0,0 @@
-## Broker settings.
-BROKER_VHOST = "rabbitmqhost"
-BROKER_USER = "rabbitmq"
-BROKER_PASSWORD = "qweqwe"
diff --git a/rhodecode/lib/celerylib/__init__.py b/rhodecode/lib/celerylib/__init__.py
--- a/rhodecode/lib/celerylib/__init__.py
+++ b/rhodecode/lib/celerylib/__init__.py
@@ -38,6 +38,7 @@ from vcs.utils.lazy import LazyProperty
 from rhodecode.lib import str2bool
 from rhodecode.lib.pidlock import DaemonLock, LockHeld
 
+from celery.messaging import establish_connection
 from pylons import  config
 
 log = logging.getLogger(__name__)
@@ -58,7 +59,17 @@ class ResultWrapper(object):
 def run_task(task, *args, **kwargs):
     if CELERY_ON:
         try:
-            t = task.delay(*args, **kwargs)
+            kw = {
+                'hostname':config['app_conf'].get('broker.host'),
+                'userid':config['app_conf'].get('broker.user'),
+                'password':config['app_conf'].get('broker.password'),
+                'virtual_host':config['app_conf'].get('broker.vhost'),
+                'port':config['app_conf'].get('broker.port'),
+            }
+            conn = establish_connection(**kw)
+            publisher = task.get_publisher(connection=conn)
+            t = task.apply_async(args=args, kwargs=kwargs, publisher=publisher)
+
             log.info('running task %s:%s', t.task_id, task)
             return t
         except socket.error, e: