diff --git a/defaults/main.yml b/defaults/main.yml
index b176ff8..15f21b3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
 # defaults file for /usr/local/google/home/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-opdk-admin-user
-pubkey: '~/.ssh/id_rsa.pub'
+# pubkey_path: '~/.ssh/id_rsa.pub'
 permit_root_login: False
 user: "{{ opdk_user_name }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 0da9326..9ed4de4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,10 +1,11 @@
 ---
 # tasks file for /usr/local/google/home/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-opdk-admin-user
-#- name: Copy local public keys to server for user {{ user }}
-#  authorized_key:
-#    user: '{{ user }}'
-#    state: present
-#    key: "{{ lookup('file', '{{ pubkey }}') }}"
+- name: Copy local public keys to server for user {{ user }}
+  authorized_key:
+    user: '{{ user }}'
+    state: present
+    key: "{{ lookup('file', '{{ pubkey_path }}') }}"
+  when: pubkey_path is defined | default(False)
 
 - name: Update user with NOPASSWD
   lineinfile: