diff --git a/setup/podman-homeassistant-install.sh b/setup/podman-homeassistant-install.sh
index e2b1108e..9cb2ad86 100644
--- a/setup/podman-homeassistant-install.sh
+++ b/setup/podman-homeassistant-install.sh
@@ -110,6 +110,16 @@ systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
 msg_ok "Customized Container"
   fi
 
+podman generate systemd \
+    --new --name homeassistant \
+    > /etc/systemd/system/homeassistant.service 
+systemctl enable homeassistant &>/dev/null
+
+podman generate systemd \
+    --new --name yacht \
+    > /etc/systemd/system/yacht.service 
+systemctl enable yacht &>/dev/null
+
 msg_info "Cleaning up"
 apt-get autoremove >/dev/null
 apt-get autoclean >/dev/null