diff --git a/ansible/environments/vm/host_vars/freebsdupdatemrmanager b/ansible/environments/vm/host_vars/freebsdupdatemrmanager
new file mode 100644
index 0000000..ef13840
--- /dev/null
+++ b/ansible/environments/vm/host_vars/freebsdupdatemrmanager
@@ -0,0 +1,4 @@
+os_flavor: "freebsd"
+build_user:
+  name: root
+  group: wheel
diff --git a/ansible/environments/vm/hosts b/ansible/environments/vm/hosts
index afaa022..efffe2b 100644
--- a/ansible/environments/vm/hosts
+++ b/ansible/environments/vm/hosts
@@ -1,9 +1,13 @@
 [vm]
 poudriereodo ansible_user=builder ansible_host=10.213.177.12
 poudrieremrmanager ansible_user=root ansible_host=poudriere
+freebsdupdatemrmanager ansible_user=root ansible_host=freebsdupdate
 #
 # Put in ~/.ssh/config
 #    Host poudriere
 #       ProxyJump talexander@mrmanager
 #       HostName 10.215.1.203
 #
+#    Host freebsdupdate
+#       ProxyJump talexander@mrmanager
+#       HostName 10.215.1.213
diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index 29d3d1f..dcc90d4 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -124,4 +124,14 @@
   vars:
     ansible_become: True
   roles:
-    - freebsd_update_server    
\ No newline at end of file
+    - freebsd_update_server    
+
+- hosts: freebsdupdatemrmanager
+  vars:
+    ansible_become: True
+  roles:
+    - sudo # for poudboot script
+    - doas
+    - fstab
+    - build
+    - freebsd_update_server
\ No newline at end of file
diff --git a/ansible/roles/build/meta/main.yaml b/ansible/roles/build/meta/main.yaml
index 8586ba4..d62eaf8 100644
--- a/ansible/roles/build/meta/main.yaml
+++ b/ansible/roles/build/meta/main.yaml
@@ -1,3 +1,5 @@
 dependencies:
-  - users
-  - gpg
+  - role: users
+    when: 'os_flavor == "linux"'
+  - role: gpg
+    when: 'os_flavor == "linux"'
diff --git a/ansible/roles/build/tasks/common.yaml b/ansible/roles/build/tasks/common.yaml
index 225b20c..b0a9a0a 100644
--- a/ansible/roles/build/tasks/common.yaml
+++ b/ansible/roles/build/tasks/common.yaml
@@ -3,12 +3,3 @@
 
 - import_tasks: tasks/linux.yaml
   when: 'os_flavor == "linux"'
-
-- include_tasks:
-    file: tasks/peruser.yaml
-    apply:
-      become: yes
-      become_user: "{{ initialize_user }}"
-  loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}"
-  loop_control:
-    loop_var: initialize_user
diff --git a/ansible/roles/build/tasks/peruser.yaml b/ansible/roles/build/tasks/peruser.yaml
deleted file mode 100644
index 111e886..0000000
--- a/ansible/roles/build/tasks/peruser.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- include_role:
-    name: per_user
-
-# - name: Create directories
-#   file:
-#     name: "{{ account_homedir.stdout }}/{{ item }}"
-#     state: directory
-#     mode: 0700
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - ".config/foo"
-
-# - name: Copy files
-#   copy:
-#     src: "files/{{ item.src }}"
-#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
-#     mode: 0600
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - src: foo.conf
-#       dest: .config/foo/foo.conf
-
-- import_tasks: tasks/peruser_freebsd.yaml
-  when: 'os_flavor == "freebsd"'
-
-- import_tasks: tasks/peruser_linux.yaml
-  when: 'os_flavor == "linux"'
diff --git a/ansible/roles/build/tasks/peruser_freebsd.yaml b/ansible/roles/build/tasks/peruser_freebsd.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/build/tasks/peruser_linux.yaml b/ansible/roles/build/tasks/peruser_linux.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/freebsd_update_server/tasks/common.yaml b/ansible/roles/freebsd_update_server/tasks/common.yaml
index 764e0c6..b0a9a0a 100644
--- a/ansible/roles/freebsd_update_server/tasks/common.yaml
+++ b/ansible/roles/freebsd_update_server/tasks/common.yaml
@@ -3,13 +3,3 @@
 
 - import_tasks: tasks/linux.yaml
   when: 'os_flavor == "linux"'
-
-- include_tasks:
-    file: tasks/peruser.yaml
-    apply:
-      become: yes
-      become_user: "{{ initialize_user }}"
-  when: users is defined
-  loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}"
-  loop_control:
-    loop_var: initialize_user
diff --git a/ansible/roles/freebsd_update_server/tasks/freebsd.yaml b/ansible/roles/freebsd_update_server/tasks/freebsd.yaml
index f7edb61..e5139a0 100644
--- a/ansible/roles/freebsd_update_server/tasks/freebsd.yaml
+++ b/ansible/roles/freebsd_update_server/tasks/freebsd.yaml
@@ -1,8 +1,9 @@
-# - name: Install packages
-#   package:
-#     name:
-#       - foo
-#     state: present
+- name: Install packages
+  package:
+    name:
+      - git
+      - tmux # For convenience
+    state: present
 
 - name: Create directories
   file:
diff --git a/ansible/roles/freebsd_update_server/tasks/peruser.yaml b/ansible/roles/freebsd_update_server/tasks/peruser.yaml
deleted file mode 100644
index 111e886..0000000
--- a/ansible/roles/freebsd_update_server/tasks/peruser.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- include_role:
-    name: per_user
-
-# - name: Create directories
-#   file:
-#     name: "{{ account_homedir.stdout }}/{{ item }}"
-#     state: directory
-#     mode: 0700
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - ".config/foo"
-
-# - name: Copy files
-#   copy:
-#     src: "files/{{ item.src }}"
-#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
-#     mode: 0600
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - src: foo.conf
-#       dest: .config/foo/foo.conf
-
-- import_tasks: tasks/peruser_freebsd.yaml
-  when: 'os_flavor == "freebsd"'
-
-- import_tasks: tasks/peruser_linux.yaml
-  when: 'os_flavor == "linux"'
diff --git a/ansible/roles/freebsd_update_server/tasks/peruser_freebsd.yaml b/ansible/roles/freebsd_update_server/tasks/peruser_freebsd.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/freebsd_update_server/tasks/peruser_linux.yaml b/ansible/roles/freebsd_update_server/tasks/peruser_linux.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/fstab/tasks/common.yaml b/ansible/roles/fstab/tasks/common.yaml
index fef1101..c4f2d20 100644
--- a/ansible/roles/fstab/tasks/common.yaml
+++ b/ansible/roles/fstab/tasks/common.yaml
@@ -3,13 +3,3 @@
 
 - import_tasks: tasks/linux.yaml
   when: 'os_flavor == "linux"'
-
-- include_tasks:
-    file: tasks/peruser.yaml
-    apply:
-      become: yes
-      become_user: "{{ initialize_user }}"
-  when: users is defined
-  loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}"
-  loop_control:
-    loop_var: initialize_user
diff --git a/ansible/roles/fstab/tasks/peruser.yaml b/ansible/roles/fstab/tasks/peruser.yaml
deleted file mode 100644
index 111e886..0000000
--- a/ansible/roles/fstab/tasks/peruser.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- include_role:
-    name: per_user
-
-# - name: Create directories
-#   file:
-#     name: "{{ account_homedir.stdout }}/{{ item }}"
-#     state: directory
-#     mode: 0700
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - ".config/foo"
-
-# - name: Copy files
-#   copy:
-#     src: "files/{{ item.src }}"
-#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
-#     mode: 0600
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - src: foo.conf
-#       dest: .config/foo/foo.conf
-
-- import_tasks: tasks/peruser_freebsd.yaml
-  when: 'os_flavor == "freebsd"'
-
-- import_tasks: tasks/peruser_linux.yaml
-  when: 'os_flavor == "linux"'
diff --git a/ansible/roles/fstab/tasks/peruser_freebsd.yaml b/ansible/roles/fstab/tasks/peruser_freebsd.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/fstab/tasks/peruser_linux.yaml b/ansible/roles/fstab/tasks/peruser_linux.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
index f02f4b3..54a4996 100644
--- a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
+++ b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
@@ -78,6 +78,11 @@
                         // brianai
                         "hw-address": "06:a6:dc:59:78:12",
                         "ip-address": "10.215.1.215"
+                    },
+                    {
+                        // freebsdupdate
+                        "hw-address": "06:14:5c:92:3d:5b",
+                        "ip-address": "10.215.1.213"
                     }
                 ]
             }
diff --git a/ansible/run.bash b/ansible/run.bash
index 294ba62..7021801 100755
--- a/ansible/run.bash
+++ b/ansible/run.bash
@@ -38,6 +38,8 @@ elif [ "$target" = "jail_admin_git" ]; then
     ansible-playbook -v -i environments/jail playbook.yaml --diff --limit admin_git "${@}"
 elif [ "$target" = "jail_public_dns" ]; then
     ansible-playbook -v -i environments/jail playbook.yaml --diff --limit public_dns "${@}"
+elif [ "$target" = "vm_freebsdupdatemrmanager" ]; then
+    ansible-playbook -v -i environments/vm playbook.yaml --diff --limit freebsdupdatemrmanager "${@}"
 else
     die 1 "Unrecognized target"
 fi