diff --git a/flightctl/apps/hyperv-migration/etc/flightctl/hooks.d/afterupdating/30-hyperv-migration.yaml b/flightctl/apps/hyperv-migration/etc/flightctl/hooks.d/afterupdating/30-hyperv-migration.yaml
index 9428255..31d9f4b 100644
--- a/flightctl/apps/hyperv-migration/etc/flightctl/hooks.d/afterupdating/30-hyperv-migration.yaml
+++ b/flightctl/apps/hyperv-migration/etc/flightctl/hooks.d/afterupdating/30-hyperv-migration.yaml
@@ -1,5 +1,5 @@
 - if:
-  - path: /etc/default/migrate-vm-printserver.env
+  - path: /etc/flightctl/hooks.d/afterupdating/30-hyperv-migration.yaml
     op: [created, updated]
-  run: /bin/sh -Eeuo pipefail -c 'systemctl enable migrate-vm@printserver.service ; systemctl restart migrate-vm@printserver.service'
+  run: /bin/sh -Eeuo pipefail -c 'systemctl enable migrate-vm@printserver.service ; systemctl restart --no-block migrate-vm@printserver.service'
   timeout: 5m
diff --git a/flightctl/apps/nextcloud/etc/flightctl/hooks.d/afterupdating/30-nextcloud.yaml b/flightctl/apps/nextcloud/etc/flightctl/hooks.d/afterupdating/30-nextcloud.yaml
index c52e384..740693c 100644
--- a/flightctl/apps/nextcloud/etc/flightctl/hooks.d/afterupdating/30-nextcloud.yaml
+++ b/flightctl/apps/nextcloud/etc/flightctl/hooks.d/afterupdating/30-nextcloud.yaml
@@ -1,5 +1,5 @@
 - if:
   - path: /etc/containers/systemd/nextcloud/
     op: [created, updated]
-  run: /bin/sh -Eeuo pipefail -c 'systemctl enable nextcloud.target ; systemctl restart nextcloud.target'
+  run: /bin/sh -Eeuo pipefail -c 'systemctl enable nextcloud.target ; systemctl restart --no-block nextcloud.target'
   timeout: 5m
diff --git a/flightctl/apps/odoo/etc/flightctl/hooks.d/afterupdating/30-odoo.yaml b/flightctl/apps/odoo/etc/flightctl/hooks.d/afterupdating/30-odoo.yaml
index f3c63fb..710ceeb 100644
--- a/flightctl/apps/odoo/etc/flightctl/hooks.d/afterupdating/30-odoo.yaml
+++ b/flightctl/apps/odoo/etc/flightctl/hooks.d/afterupdating/30-odoo.yaml
@@ -1,5 +1,5 @@
 - if:
   - path: /etc/containers/systemd/odoo/
     op: [created, updated]
-  run: /bin/sh -Eeuo pipefail -c 'systemctl enable odoo.target ; systemctl restart odoo.target'
+  run: /bin/sh -Eeuo pipefail -c 'systemctl enable odoo.target ; systemctl restart --no-block odoo.target'
   timeout: 5m
diff --git a/flightctl/apps/vm-nextcloud/etc/flightctl/hooks.d/afterupdating/30-edge-vm.yaml b/flightctl/apps/vm-nextcloud/etc/flightctl/hooks.d/afterupdating/30-edge-vm.yaml
index 21a2481..2a3afdf 100644
--- a/flightctl/apps/vm-nextcloud/etc/flightctl/hooks.d/afterupdating/30-edge-vm.yaml
+++ b/flightctl/apps/vm-nextcloud/etc/flightctl/hooks.d/afterupdating/30-edge-vm.yaml
@@ -1,5 +1,5 @@
 - if:
-  - path: /etc/default/bootstrap-vm-nextcloud.env
+  - path: /etc/flightctl/hooks.d/afterupdating/30-edge-vm.yaml
     op: [created, updated]
-  run: /bin/sh -Eeuo pipefail -c 'systemctl enable bootstrap-vm@nextcloud.service ; systemctl restart bootstrap-vm@nextcloud.service'
+  run: /bin/sh -Eeuo pipefail -c 'systemctl enable bootstrap-vm@nextcloud.service ; systemctl restart --no-block bootstrap-vm@nextcloud.service'
   timeout: 5m