diff --git a/Makefile b/Makefile
index 2fd86f6d..b0d93bb2 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ charts: clean
 
 # Perform Linting
 .PHONY: lint
-lint: pep8 helm_lint
+lint: pep8 helm_lint build_docs
 
 # Dry run templating of chart
 .PHONY: dry-run
@@ -38,6 +38,9 @@ dry-run: clean
 	tools/helm_tk.sh $(HELM)
 	$(HELM) template charts/shipyard
 
+.PHONY: docs
+docs: clean build_docs
+
 # Make targets intended for use by the primary targets above.
 
 .PHONY: build_airflow
@@ -60,3 +63,7 @@ pep8:
 helm_lint: clean
 	tools/helm_tk.sh $(HELM)
 	$(HELM) lint charts/shipyard
+
+.PHONY: build_docs
+build_docs:
+	tox -e docs