diff --git a/group_vars/all.yml b/group_vars/all.yml
index d93ab3af..b3d7cd81 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -57,6 +57,17 @@
       servers:
         - production
         - test
+    - username: ansible-user
+      password: "{{ lookup('keepass', 'ansible_user_linux_password_hash', 'password') }}"
+      update_password: on_create
+      ssh_key: "{{ lookup('keepass', 'ansible_user_ssh_pubkey', 'password') }}"
+      use_sudo: yes
+      use_sudo_nopass: yes
+      user_state: present
+      groups: ssh, sudo
+      servers:
+        - production
+        - test
   ### geerlingguy.dotfiles
   dotfiles_repo: "https://git.mgrote.net/mg/dotfiles"
   dotfiles_repo_local_destination: "/home/mg/dotfiles-repo"
diff --git a/keepass_db.kdbx b/keepass_db.kdbx
index eb415e1b..abebfd1e 100644
Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ
diff --git a/playbooks/base/1_bootstrap.yml b/playbooks/base/1_bootstrap.yml
index d20f3932..43117c6d 100644
--- a/playbooks/base/1_bootstrap.yml
+++ b/playbooks/base/1_bootstrap.yml
@@ -5,13 +5,8 @@
     roles:
       - { role: robertdebock.bootstrap, tags: "bootstrap", become: yes}
       - { role: ryandaniels.create_users, tags: "user", become: yes}
-      - { role: nickjj.ansible-user, tag: "ansible", become: yes }
 
     vars:
-      ### nickjj.ansible-users
-      user_name: "ansible-user"
-      user_local_ssh_key_path: "/home/mg/ansible/id_rsa_ansible_user_pub"
-      user_enable_passwordless_sudo: True
       ### reobertdebock.bootstrap
       bootstrap_user: mg
       bootstrap_wait_for_host: no
diff --git a/roles/nickjj.ansible-user b/roles/nickjj.ansible-user
deleted file mode 160000
index 1612f6a0..00000000
--- a/roles/nickjj.ansible-user
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1612f6a06216665cbec2ae8643c759b9962bbf36