diff --git a/Makefile b/Makefile
index bc5cc65..db27358 100644
--- a/Makefile
+++ b/Makefile
@@ -377,9 +377,13 @@
 	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) ansible/maas-provision.yml --extra-vars='maas_user=maas vagrant_name=cord_compute$*'" $(LOGCMD)
 	touch $@
 
-$(M)/refresh-fabric: | $(M)/compute1-up
-	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/cord-refresh-fabric.yml" $(LOGCMD)
-	touch $@
+
+# Fabric targets
+fabric-refresh: | $(M)/setup-automation
+	$(ANSIBLE_PB) $(PI)/cord-refresh-fabric.yml $(LOGCMD)
+
+fabric-pingtest:
+	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) --private-key ~/.ssh/cord_rsa $(PI)/cord-fabric-pingtest.yml" $(LOGCMD)
 
 
 # Testing targets
@@ -390,8 +394,7 @@
 mcord-%:
 	$(ANSIBLE_PB) ../orchestration/profiles/mcord/test/mcord-$*-playbook.yml $(LOGCMD)
 
-fabric-pingtest: $(M)/refresh-fabric
-	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/cord-fabric-pingtest.yml" $(LOGCMD)
+
 
 
 # Local Targets, bring up XOS containers without a VM