diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
+# required for pushd to work..
 SHELL = /bin/bash
 
+
 # set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
 OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
 
@@ -21,7 +23,7 @@ test:
 	make test-only
 
 
-.PHONY:test-clean
+.PHONY: test-clean
 ## run test-clean and tests
 test-clean:
 	rm -rf coverage.xml htmlcov junit.xml pylint.log result
@@ -37,6 +39,7 @@ test-only:
 	--cov-report=term-missing --cov-report=html \
 	--cov=rhodecode rhodecode
 
+
 .PHONY: test-only-mysql
 ## run tests against mysql
 test-only-mysql:
@@ -93,25 +96,38 @@ web-build:
 	done
 
 .PHONY: pip-packages
-## show outdated packages
+## Show outdated packages
 pip-packages:
 	python ${OUTDATED_PACKAGES}
 
 
-.PHONY: sdist
-## Build sdist
-sdist:
-	python setup.py sdist
+.PHONY: build
+## Build sdist/egg
+build:
+	python -m build
 
 
 .PHONY: dev-env
 ## make dev-env based on the requirements files and install develop of packages
 dev-env:
+	pip install build virtualenv
 	pushd ../rhodecode-vcsserver/ && make dev-env && popd
-	pip wheel --wheel-dir=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_test.txt -r requirements_debug.txt
-	pip install --no-index --find-links=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_test.txt -r requirements_debug.txt
+	pip wheel --wheel-dir=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_rc_tools.txt -r requirements_test.txt -r requirements_debug.txt
+	pip install --no-index --find-links=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_rc_tools.txt -r requirements_test.txt -r requirements_debug.txt
 	pip install -e .
 
+
+.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
+
+.PHONY: dev-srv-g
+## run gunicorn multi process workers
+dev-srv-g:
+	gunicorn --workers=4 --paste .dev/dev_g.ini --bind=0.0.0.0:10020 --worker-class=gevent --threads=1 --config=configs/gunicorn_config.py --timeout=120
+
+
 # Default command on calling make
 .DEFAULT_GOAL := show-help
 
@@ -153,4 +169,3 @@ show-help:
 		} \
 		printf "\n"; \
 	}'
-