diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -86,15 +86,10 @@ sh:
 	make dev-sh
 
 
-.PHONY: dev-srv
-## run develop server instance, docker exec -it $(docker ps -q --filter 'name=dev-enterprise-ce') /bin/bash
-dev-srv:
-	pserve --reload .dev/dev.ini
-
 ## Allows changes of workers e.g make dev-srv-g workers=2
 workers?=1
 
-.PHONY: dev-srv-g
+.PHONY: dev-srv
 ## run gunicorn multi process workers
 dev-srv-g:
 	gunicorn --paste=.dev/dev.ini --bind=0.0.0.0:10010 --config=.dev/gunicorn_config.py --reload --workers=$(workers)
diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -9,23 +9,6 @@
 host = 0.0.0.0
 port = 10010
 
-; ##################################################
-; WAITRESS WSGI SERVER - Recommended for Development
-; ##################################################
-
-; use server type
-use = egg:waitress#main
-
-; number of worker threads
-threads = 5
-
-; MAX BODY SIZE 100GB
-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
-
 
 ; ###########################
 ; GUNICORN APPLICATION SERVER
@@ -34,7 +17,7 @@ asyncore_use_poll = true
 ; run with gunicorn --paste rhodecode.ini
 
 ; Module to use, this setting shouldn't be changed
-#use = egg:gunicorn#main
+use = egg:gunicorn#main
 
 [app:main]
 ; The %(here)s variable will be replaced with the absolute path of parent directory
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -6,7 +6,7 @@
 
 [server:main]
 ; COMMON HOST/IP CONFIG
-host = 127.0.0.1
+host = 0.0.0.0
 port = 10010