diff --git a/Makefile b/Makefile
index 261f0c903..fa39d4ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,8 @@ build-local:
 pypi-build: clean
 	@python setup.py sdist bdist_wheel
 
-dev: pypi-build  ## install envd command for local debug
+dev: clean build-local  ## install envd command for local debug
+	@python setup.py bdist_wheel
 	@pip install --force-reinstall dist/*.whl
 
 generate: mockgen-install  ## Generate mocks
diff --git a/setup.py b/setup.py
index 9b4f344f5..45fab3326 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
 def build_envd_if_not_found():
     if not os.path.exists("bin/envd"):
         logging.info("envd not found. Build from scratch")
-        errno = subprocess.call(["make", "build"])
+        errno = subprocess.call(["make", "build-release"])
         assert errno == 0, "Failed to build envd"