diff --git a/modules/server/containers/default.nix b/modules/server/containers/default.nix
index 931d9c0..a19859e 100644
--- a/modules/server/containers/default.nix
+++ b/modules/server/containers/default.nix
@@ -81,11 +81,13 @@ in {
       }) allVMConfigs
        // mkNamedUnits (e: {
         name = "${e.name}-setup";
-        value = {
+       value = {
           description = "Run ${e.name} setup";
           after = [ "podman-${e.name}-${e.trigger}.service" ];
           wants = [ "podman-${e.name}-${e.trigger}.service" ];
+          partOf = [ "podman-${e.name}-${e.trigger}.service" ];
           wantedBy = [ "multi-user.target" ];
+          restartTriggers = [ e.script ];
           serviceConfig = {
             Type = "oneshot";
             TimeoutStartSec = "360s";