diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -79,7 +79,7 @@ asyncore_use_poll = true
 #proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
-#worker_class = sync
+#worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
@@ -295,12 +295,17 @@ labs_settings_active = true
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
+## run: /path/to/celery worker \
+##     -E --beat --app rhodecode.lib.celerylib.loader \
+##     --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
+##     --loglevel DEBUG --ini /path/to/rhodecode.ini
+
 use_celery = false
 
-# connection url to the message broker (default rabbitmq)
+## connection url to the message broker (default rabbitmq)
 celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost
 
-# maximum tasks to execute before worker restart
+## maximum tasks to execute before worker restart
 celery.max_tasks_per_child = 100
 
 ## tasks will never be sent to the queue, but executed locally instead.
@@ -554,7 +559,7 @@ vcs.hooks.protocol = http
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
-vcs.start_server = true
+vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
 ## `hg`  - mercurial
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -79,7 +79,7 @@ workers = 2
 proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
-worker_class = sync
+worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
@@ -270,12 +270,17 @@ labs_settings_active = true
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
+## run: /path/to/celery worker \
+##     -E --beat --app rhodecode.lib.celerylib.loader \
+##     --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
+##     --loglevel DEBUG --ini /path/to/rhodecode.ini
+
 use_celery = false
 
-# connection url to the message broker (default rabbitmq)
+## connection url to the message broker (default rabbitmq)
 celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost
 
-# maximum tasks to execute before worker restart
+## maximum tasks to execute before worker restart
 celery.max_tasks_per_child = 100
 
 ## tasks will never be sent to the queue, but executed locally instead.