diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -34,9 +34,10 @@ pdebug = false
 host = 127.0.0.1
 port = 5000
 
-##########################
-## WAITRESS WSGI SERVER ##
-##########################
+##################################
+##     WAITRESS WSGI SERVER     ##
+## Recommended for Development  ##
+##################################
 use = egg:waitress#main
 ## number of worker threads
 threads = 5
@@ -56,7 +57,7 @@ asyncore_use_poll = true
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
-#workers = 1
+#workers = 2
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
@@ -372,9 +373,15 @@ beaker.session.auto = false
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
 
+# WHOOSH
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
+## ELASTICSEARCH (EE edition only). Requires Elastic Search cluster
+## to be installed, and running
+#search.module = rc_elasticsearch
+#search.location = http://localhost:9200
+
 ###################################
 ## ERROR AND LOG HANDLING SYSTEM ##
 ###################################
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -34,46 +34,47 @@ pdebug = false
 host = 127.0.0.1
 port = 5000
 
-##########################
-## WAITRESS WSGI SERVER ##
-##########################
-use = egg:waitress#main
+##################################
+##     WAITRESS WSGI SERVER     ##
+## Recommended for Development  ##
+##################################
+#use = egg:waitress#main
 ## number of worker threads
-threads = 5
+#hreads = 5
 ## MAX BODY SIZE 100GB
-max_request_body_size = 107374182400
+#max_request_body_size = 107374182400
 ## Use poll instead of select, fixes file descriptors limits problems.
 ## May not work on old windows systems.
-asyncore_use_poll = true
+#asyncore_use_poll = true
 
 
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
-#use = egg:gunicorn#main
+use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
-#workers = 1
+workers = 2
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
 ## process name
-#proc_name = rhodecode
+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 = sync
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
 ## restarted, could prevent memory leaks
-#max_requests = 1000
-#max_requests_jitter = 30
+max_requests = 1000
+max_requests_jitter = 30
 ## ammount of time a worker can spend with handling a request before it
 ## gets killed and restarted. Set to 6hrs
-#timeout = 21600
+timeout = 21600
 
 
 ## prefix middleware for RhodeCode, disables force_https flag.
@@ -305,7 +306,7 @@ beaker.cache.repo_cache_long.expire = 25
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file, ext:memcached, ext:database, and memory(default).
+## types are file, ext:memcached, ext:database, and memory (default).
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions/data
 
@@ -319,7 +320,7 @@ beaker.session.data_dir = %(here)s/data/
 
 beaker.session.key = rhodecode
 beaker.session.secret = production-rc-uytcxaz
-#beaker.session.lock_dir = %(here)s/data/sessions/lock
+beaker.session.lock_dir = %(here)s/data/sessions/lock
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
@@ -346,9 +347,15 @@ beaker.session.auto = false
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
 
+# WHOOSH
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
+## ELASTICSEARCH (EE edition only). Requires Elastic Search cluster
+## to be installed, and running
+#search.module = rc_elasticsearch
+#search.location = http://localhost:9200
+
 ###################################
 ## ERROR AND LOG HANDLING SYSTEM ##
 ###################################
@@ -361,7 +368,7 @@ appenlight = false
 
 appenlight.server_url = https://api.appenlight.com
 appenlight.api_key = YOUR_API_KEY
-;appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
+#appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
 
 # used for JS client
 appenlight.api_public_key = YOUR_API_PUBLIC_KEY