diff --git a/ansible/environments/vm/host_vars/poudrieremrmanager b/ansible/environments/vm/host_vars/poudrieremrmanager
index 0a16e12..91fb15e 100644
--- a/ansible/environments/vm/host_vars/poudrieremrmanager
+++ b/ansible/environments/vm/host_vars/poudrieremrmanager
@@ -1,4 +1,5 @@
 os_flavor: "freebsd"
+sshd_enabled: true
 custom_repo: "file:///usr/local/poudriere/data/packages/currentznver4-default-framework"
 pkgbase_url: "file:///usr/local/poudriere/data/images/currentznver4-repo/FreeBSD:15:amd64/latest"
 poudriere_builds:
diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index b90d853..528189b 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -67,9 +67,12 @@
     ansible_become: True
   roles:
     - sudo # for poudboot script
+    - doas
     - fstab
     - package_manager
+    - zsh
     - termcap
+    - sshd
     - portshaker
     - poudriere
     - poudrierenginx
diff --git a/ansible/roles/base/tasks/common.yaml b/ansible/roles/base/tasks/common.yaml
index ac88360..8879a5d 100644
--- a/ansible/roles/base/tasks/common.yaml
+++ b/ansible/roles/base/tasks/common.yaml
@@ -19,6 +19,7 @@
       - tcpdump
       - moreutils # for ts [%Y-%m-%d %H:%M:%.S]
       - ddrescue
+      - dmidecode
     state: present
 
 - name: Install packages
diff --git a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
index e2d8bd8..42f67ee 100644
--- a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
+++ b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
@@ -83,6 +83,7 @@ sysutils/bhyve-firmware
 sysutils/btop
 sysutils/cpu-microcode
 sysutils/ddrescue
+sysutils/dmidecode
 sysutils/dsbmd
 sysutils/exfat-utils
 sysutils/fusefs-exfat
diff --git a/ansible/roles/poudriere/files/poudriere_delete_jail.bash b/ansible/roles/poudriere/files/poudriere_delete_jail.bash
index 712e9bd..d328cba 100644
--- a/ansible/roles/poudriere/files/poudriere_delete_jail.bash
+++ b/ansible/roles/poudriere/files/poudriere_delete_jail.bash
@@ -13,6 +13,7 @@ fi
 
 poudriere jail -d -j "$jail_name" -C all
 rm -rf /usr/local/poudriere/data/images/${jail_name}-repo \
-   /usr/obj/usr/local/poudriere/jails/${jail_name}
+   /usr/obj/usr/local/poudriere/jails/${jail_name} \
+   /usr/local/poudriere/data/packages/${jail_name}-*
 
 echo "Deleted jail $jail_name"