diff --git a/bundles/users/items.py b/bundles/users/items.py
index 2ca1be4..4d6a381 100644
--- a/bundles/users/items.py
+++ b/bundles/users/items.py
@@ -2,27 +2,20 @@ from os.path import join, exists
 
 directories = {}
 users = {}
-files = {}
 groups = {}
 
-users['root'] = {
-    'home': '/root',
-    'shell': '/bin/bash',
-    'password': repo.vault.human_password_for('root on {}'.format(node.name)),
-}
-
-files['/etc/bash.bashrc'] = {
-    'source': 'bashrc',
-    'content_type': 'mako',
-}
-
-files['/etc/tmux.conf'] = {
-    'source': 'tmux.conf',
-    'content_type': 'mako',
-}
-
-files['/etc/vim/vimrc.local'] = {
-    'source': 'vimrc',
+files = {
+    '/etc/bash.bashrc': {
+        'source': 'bashrc',
+        'content_type': 'mako',
+    },
+    '/etc/tmux.conf': {
+        'source': 'tmux.conf',
+        'content_type': 'mako',
+    },
+    '/etc/vim/vimrc.local': {
+        'source': 'vimrc',
+    },
 }
 
 for username, attrs in node.metadata['users'].items():
diff --git a/bundles/users/metadata.py b/bundles/users/metadata.py
index cf509a4..384ff39 100644
--- a/bundles/users/metadata.py
+++ b/bundles/users/metadata.py
@@ -5,4 +5,11 @@ defaults = {
             'vim': {},
         },
     },
+    'users': {
+        'root': {
+            'home': '/root',
+            'shell': '/bin/bash',
+            'password': repo.vault.human_password_for('root on {}'.format(node.name)),
+        },
+    },
 }