diff --git a/xos/configurations/common/Makefile.devstack b/xos/configurations/common/Makefile.devstack
index 6ec284f..e60434e 100644
--- a/xos/configurations/common/Makefile.devstack
+++ b/xos/configurations/common/Makefile.devstack
@@ -2,7 +2,7 @@
 DEVSTACK_ROOT:=~/devstack
 SETUPDIR:=../setup
 
-all: prereqs admin-openrc flat_name nodes_yaml public_key private_key ceilometer_url node_key net_fix
+all: prereqs admin-openrc flat_name nodes_yaml public_key private_key ceilometer_url other_keys net_fix
 
 prereqs:
 	make -f Makefile.prereqs
@@ -18,7 +18,7 @@
 	bash -c "source $(SETUPDIR)/admin-openrc.sh; openstack network set --share private"
 
 nodes_yaml:
-	export SETUPDIR=$(SETUPDIR); bash ./make-nodes-yaml.sh 
+	export SETUPDIR=$(SETUPDIR); bash ./make-nodes-yaml.sh
 
 ceilometer_url:
 	echo http://`hostname -i`/xosmetering/ > $(SETUPDIR)/ceilometer_url
@@ -32,9 +32,10 @@
 ~/.ssh/id_rsa.pub:
 	cat /dev/zero | ssh-keygen -q -N ""
 
-node_key:
-	sudo cat ~/.ssh/id_rsa > $(SETUPDIR)/node_key
-	sudo cat ~/.ssh/id_rsa.pub > $(SETUPDIR)/node_key.pub
+other_keys: public_key private_key
+	cp $(SETUPDIR)/id_rsa $(SETUPDIR)/node_key
+	cp $(SETUPDIR)/id_rsa.pub $(SETUPDIR)/node_key.pub
+	cp $(SETUPDIR)/id_rsa.pub $(SETUPDIR)/padmin_public_key
 
 net_fix:
 	sudo devstack/net-fix.sh
diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index 5112311..19e9abd 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -2,7 +2,7 @@
 
 cloudlab: common_cloudlab xos
 
-devstack: upgrade_pkgs common_devstack devstack_net_fix xos
+devstack: upgrade_pkgs common_devstack xos
 
 xos:
 	sudo MYIP=$(MYIP) docker-compose up -d
@@ -34,9 +34,5 @@
 enter-synchronizer:
 	sudo docker exec -it devel_xos_synchronizer_openstack_1 bash
 
-devstack_net_fix:
-	sudo ../common/devstack/net-fix.sh
-	sudo bash -c "source ../setup/admin-openrc.sh; neutron subnet-update private-subnet --dns-nameservers list=true 8.8.8.8 8.8.4.4"
-
 upgrade_pkgs:
 	sudo pip install httpie --upgrade