diff --git a/server/Makefile b/server/Makefile
index 17020c97..06b9fd4d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -3,7 +3,7 @@ include Makefile-flash-att
 unit-tests:
 	pytest -s -vv -m "not private" tests
 
-gen-server:
+gen-server: upgrade-pip
 	# Compile protos
 	pip install grpcio-tools==1.51.1 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
 	mkdir text_generation_server/pb || true
@@ -12,12 +12,14 @@ gen-server:
 	find text_generation_server/pb/ -type f -name "*.py" -print0 -exec sed -i -e 's/^\(import.*pb2\)/from . \1/g' {} \;
 	touch text_generation_server/pb/__init__.py
 
-install-torch:
+install-torch: upgrade-pip
 	# Install specific version of torch
 	pip install torch --extra-index-url https://download.pytorch.org/whl/cu118 --no-cache-dir
 
-install: gen-server install-torch
+upgrade-pip:
 	pip install pip --upgrade
+
+install: gen-server install-torch upgrade-pip
 	pip install -r requirements.txt
 	pip install -e ".[bnb, accelerate]"