diff --git a/xos/configurations/common/Makefile.cloudlab b/xos/configurations/common/Makefile.cloudlab
index 77fdb03..e122cc7 100644
--- a/xos/configurations/common/Makefile.cloudlab
+++ b/xos/configurations/common/Makefile.cloudlab
@@ -1,4 +1,4 @@
-all: admin-openrc flat_name nodes_yaml
+all: admin-openrc flat_name nodes_yaml public_key
 
 admin-openrc:
 	sudo cat /root/setup/admin-openrc.sh > admin-openrc.sh
@@ -8,3 +8,6 @@
 
 nodes_yaml:
 	bash ./make-cloudlab-nodes-yaml.sh
+
+public_key:
+	cp ~/.ssh/id_rsa.pub .
diff --git a/xos/configurations/common/cloudlab.yaml b/xos/configurations/common/cloudlab.yaml
index de614dc..7d81c7e 100644
--- a/xos/configurations/common/cloudlab.yaml
+++ b/xos/configurations/common/cloudlab.yaml
@@ -4,7 +4,7 @@
 #   assumes the following have been created and filled with appropriate data:
 #       /root/setup/admin_openrc
 #       /root/setup/flat_net_name
-#       /root/setup/pubkey
+#       /root/setup/padmin_public_key
 
 description: >
     * Adds OpenCloud Sites, Deployments, and Controllers.
@@ -81,4 +81,4 @@
           firstname: XOS
           lastname: admin
       artifacts:
-          pubkey: /root/setup/pubkey
+          pubkey: /root/setup/padmin_public_key
diff --git a/xos/configurations/test/Dockerfile.test b/xos/configurations/test/Dockerfile.test
index 43dbf67..b098e92 100644
--- a/xos/configurations/test/Dockerfile.test
+++ b/xos/configurations/test/Dockerfile.test
@@ -2,6 +2,7 @@
 ADD xos/configurations/common/admin-openrc.sh /root/setup/
 ADD xos/configurations/common/flat_net_name /root/setup/
 ADD xos/configurations/common/cloudlab-nodes.yaml /opt/xos/configurations/commmon/
+ADD xos/configurations/common/id_rsa.pub /root/setup/padmin_public_key
 
 #CMD ["/usr/bin/make -C /opt/xos/configurations/test -f Makefile.inside"]