diff --git a/metal/roles/pxe_server/files/dhcp/Dockerfile b/metal/roles/pxe_server/files/dhcp/Dockerfile
index 0870e4a6..c3a105b6 100644
--- a/metal/roles/pxe_server/files/dhcp/Dockerfile
+++ b/metal/roles/pxe_server/files/dhcp/Dockerfile
@@ -4,4 +4,4 @@ RUN apk add dhcp
 
 RUN touch /var/lib/dhcp/dhcpd.leases
 
-CMD [ "dhcpd", "-f", "-cf", "/etc/dhcp/dhcpd.conf" ]
+CMD [ "dhcpd", "-d", "-f", "-cf", "/etc/dhcp/dhcpd.conf" ]
diff --git a/metal/roles/pxe_server/files/tftp/Dockerfile b/metal/roles/pxe_server/files/tftp/Dockerfile
index 5d632ac4..a261fb15 100644
--- a/metal/roles/pxe_server/files/tftp/Dockerfile
+++ b/metal/roles/pxe_server/files/tftp/Dockerfile
@@ -1,5 +1,7 @@
 FROM alpine:3
 
-RUN apk add tftp-hpa
+RUN apk add busybox tftp-hpa
 
-CMD [ "in.tftpd", "--foreground", "--secure", "/var/lib/tftpboot" ]
+ENTRYPOINT [ "/bin/sh", "-c" ]
+
+CMD [ "busybox syslogd -n -O /dev/stdout & in.tftpd -vvv --foreground --secure /var/lib/tftpboot" ]