diff --git a/roles/onos-vm-install/files/onos-docker-compose.yml b/roles/onos-vm-install/files/onos-docker-compose.yml
index 09255fa..c57afcb 100644
--- a/roles/onos-vm-install/files/onos-docker-compose.yml
+++ b/roles/onos-vm-install/files/onos-docker-compose.yml
@@ -15,5 +15,4 @@
       - "9876"
       network_mode: host
       volumes:
-      - ./id_rsa:/root/node_key:ro
-
+      - ./node_key:/root/node_key:ro
diff --git a/roles/onos-vm-install/files/onos-setup-playbook.yml b/roles/onos-vm-install/files/onos-setup-playbook.yml
index 24f23d1..4ab44cb 100644
--- a/roles/onos-vm-install/files/onos-setup-playbook.yml
+++ b/roles/onos-vm-install/files/onos-setup-playbook.yml
@@ -21,14 +21,11 @@
   remote_user: ubuntu
 
   tasks:
-    - name: Copy over SSH keys
+    - name: Copy over SSH key
       copy:
-        src=~/.ssh/{{ item }}
-        dest={{ ansible_user_dir }}/cord/{{ item }}
+        src={{ node_private_key }}
+        dest={{ ansible_user_dir }}/cord/node_key
         owner={{ ansible_user_id }} mode=0600
-      with_items:
-       - id_rsa
-       - id_rsa.pub
 
     - name: Copy over files to build XOS variant of ONOS
       copy:
diff --git a/roles/onos-vm-install/templates/onos-setup-vars.yml.j2 b/roles/onos-vm-install/templates/onos-setup-vars.yml.j2
index cd21505..136e686 100644
--- a/roles/onos-vm-install/templates/onos-setup-vars.yml.j2
+++ b/roles/onos-vm-install/templates/onos-setup-vars.yml.j2
@@ -1,2 +1,6 @@
 ---
-
+{% if on_maas %}
+node_private_key: "{{ maas_node_key }}"
+{% else %}
+node_private_key: "~/.ssh/id_rsa"
+{% endif %}