diff --git a/Makefile b/Makefile
index 51fcab76da..e780864ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,8 @@ install-dependencies-proto-docs:
 	mv protoc3/include/* $$HOME/include
 
 compile-protos-docs:
-	cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto
+	cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto || \
+	cd ${ROOT_DIR}; $(MAKE) install-dependencies-proto-docs && 	cd ${ROOT_DIR}/protos; PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto
 
 clean-html:
 	rm -rf 	$(ROOT_DIR)/dist
@@ -149,6 +150,11 @@ clean-html:
 build-html: clean-html
 	mkdir -p $(ROOT_DIR)/dist/python
 	mkdir -p $(ROOT_DIR)/dist/grpc
-	cd 	$(ROOT_DIR)/protos && $(MAKE) gen-docs
+
+	# Build Protobuf documentation
+	$(MAKE) compile-protos-docs
+
+	# Build Python SDK documentation
+	$(MAKE) compile-protos-python
 	cd 	$(ROOT_DIR)/sdk/python/docs && $(MAKE) html
-	cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
+	cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
\ No newline at end of file