diff --git a/Makefile b/Makefile
index af56045..1844d67 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@
 	@echo "Please specify a target (config, build, teardown, ...)"
 
 # Config file generation
-config: $(CONFIG_FILES)
+config: $(CONFIG_FILES) $(PODCONFIG_PATH)
 
 $(CONFIG_FILES):
 	ansible-playbook -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)'" $(BUILD)/ansible/genconfig.yml $(LOGCMD)
@@ -99,13 +99,6 @@
 
 # Utility targets
 
-xos-teardown: xos-update-images
-	$(ANSIBLE_PB) $(PI)/teardown-playbook.yml $(LOGCMD)
-	rm -f $(M)/onboard-profile $(M)/local-onboard-profile
-
-xos-update-images: clean-images
-	rm -f $(M)/start-xos $(M)/local-start-xos
-
 ansible-ping:
 	$(ANSIBLE) -m ping all $(LOGCMD)
 
@@ -118,14 +111,9 @@
 compute-node-refresh:
 	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/compute-node-refresh-playbook.yml" $(LOGCMD)
 
-vagrant-destroy:
-	$(VAGRANT) destroy $(LOGCMD)
-	rm -f $(M)/vagrant-up
-
 clean-images:
 	rm -f $(M)/docker-images $(M)/local-docker-images $(M)/core-image $(M)/local-core-image $(M)/build-maas-images $(M)/build-onos-apps $(M)/publish-maas-images $(M)/publish-docker-images $(M)/publish-onos-apps
 
-
 clean-genconfig:
 	rm -f $(CONFIG_FILES)
 
@@ -139,12 +127,28 @@
 clean-local: clean-profile clean-genconfig
 	rm -f $(LOCAL_MILESTONES)
 
+.PHONY: docs
+docs:
+	cd docs; make
+
 local-ubuntu-dev-env:
 	$(ANSIBLE_PB) $(PI)/bootstrap-dev-env.yml $(LOGCMD)
 
+vagrant-destroy:
+	$(VAGRANT) destroy $(LOGCMD)
+	rm -f $(M)/vagrant-up
+
+xos-teardown: xos-update-images
+	$(ANSIBLE_PB) $(PI)/teardown-playbook.yml $(LOGCMD)
+	rm -f $(M)/onboard-profile $(M)/local-onboard-profile
+
+xos-update-images: clean-images
+	rm -f $(M)/start-xos $(M)/local-start-xos
+
 
 # == PREREQS == #
 VAGRANT_UP_PREREQS     ?=
+COPY_CORD_PREREQS      ?=
 CORD_CONFIG_PREREQS    ?=
 COPY_CONFIG_PREREQS    ?=
 PREP_BUILDNODE_PREREQS ?=
@@ -178,7 +182,11 @@
 	$(VAGRANT) ssh-config $(VAGRANT_VMS) > $(SSH_CONFIG)
 	touch $@
 
-$(M)/copy-cord: | $(M)/vagrant-up
+$(M)/config-ssh-key: | $(M)/vagrant-up
+	$(ANSIBLE_PB) $(BUILD)/ansible/config-ssh-key.yml $(LOGCMD)
+	touch $@
+
+$(M)/copy-cord: | $(M)/vagrant-up $(COPY_CORD_PREREQS)
 	$(ANSIBLE_PB) $(PI)/copy-cord-playbook.yml $(LOGCMD)
 	touch $@