diff --git a/modules/live-build-config/kali-config/common/hooks/live/pentest-distro-builder.chroot b/modules/live-build-config/kali-config/common/hooks/live/pentest-distro-builder.chroot
new file mode 100644
index 00000000..9c22c5cb
--- /dev/null
+++ b/modules/live-build-config/kali-config/common/hooks/live/pentest-distro-builder.chroot
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#Populate root's home folder from /etc/skel
+cp -ru /etc/skel/* /root/
+
+#Time to git stuff...
+cd /root/
+git clone https://github.com/Veil-Framework/Veil.git
+git clone https://github.com/leebaird/discover.git
+git clone https://github.com/trustedsec/ptf
+
+#Enable our desired services
+ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
+systemctl enable ssh
+systemctl enable cups
+systemctl enable apache2
+systemctl enable mysql
+systemctl enable postgresql
+systemctl enable tor
+systemctl enable cockpit.socket
+
+msfdb init
+
diff --git a/modules/parrot-build/templates/common/hooks/pentest-distro-builder.chroot b/modules/parrot-build/templates/common/hooks/pentest-distro-builder.chroot
new file mode 100644
index 00000000..9c22c5cb
--- /dev/null
+++ b/modules/parrot-build/templates/common/hooks/pentest-distro-builder.chroot
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#Populate root's home folder from /etc/skel
+cp -ru /etc/skel/* /root/
+
+#Time to git stuff...
+cd /root/
+git clone https://github.com/Veil-Framework/Veil.git
+git clone https://github.com/leebaird/discover.git
+git clone https://github.com/trustedsec/ptf
+
+#Enable our desired services
+ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
+systemctl enable ssh
+systemctl enable cups
+systemctl enable apache2
+systemctl enable mysql
+systemctl enable postgresql
+systemctl enable tor
+systemctl enable cockpit.socket
+
+msfdb init
+