diff --git a/bootc/scenario1/root/etc/containers/systemd/nextcloud-app.container b/bootc/scenario1/root/etc/containers/systemd/nextcloud-app.container
index 3592ead..6bdc359 100644
--- a/bootc/scenario1/root/etc/containers/systemd/nextcloud-app.container
+++ b/bootc/scenario1/root/etc/containers/systemd/nextcloud-app.container
@@ -10,6 +10,9 @@ After=nextcloud-db.service nextcloud-redis.service
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/containers/systemd/configs/nextcloud-config.env
 
+# Start/stop this unit when the target is started/stopped
+PartOf=nextcloud.target
+
 [Container]
 ContainerName=nextcloud-app
 Image=docker.io/library/nextcloud:31-fpm-alpine
diff --git a/bootc/scenario1/root/etc/containers/systemd/nextcloud-db.container b/bootc/scenario1/root/etc/containers/systemd/nextcloud-db.container
index cd9d5d7..bdad765 100644
--- a/bootc/scenario1/root/etc/containers/systemd/nextcloud-db.container
+++ b/bootc/scenario1/root/etc/containers/systemd/nextcloud-db.container
@@ -6,6 +6,9 @@ After=network.target
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/containers/systemd/configs/nextcloud-config.env
 
+# Start/stop this unit when the target is started/stopped
+PartOf=nextcloud.target
+
 [Container]
 ContainerName=nextcloud-db
 Image=docker.io/library/postgres:17-alpine
diff --git a/bootc/scenario1/root/etc/containers/systemd/nextcloud-nginx.container b/bootc/scenario1/root/etc/containers/systemd/nextcloud-nginx.container
index 92e506e..0d0afea 100644
--- a/bootc/scenario1/root/etc/containers/systemd/nextcloud-nginx.container
+++ b/bootc/scenario1/root/etc/containers/systemd/nextcloud-nginx.container
@@ -6,6 +6,9 @@ After=network.target
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/containers/systemd/configs/nextcloud-config.env
 
+# Start/stop this unit when the target is started/stopped
+PartOf=nextcloud.target
+
 [Container]
 ContainerName=nextcloud-nginx
 Image=docker.io/nginxinc/nginx-unprivileged:1.20-alpine
diff --git a/bootc/scenario1/root/etc/containers/systemd/nextcloud-redis.container b/bootc/scenario1/root/etc/containers/systemd/nextcloud-redis.container
index 651366d..6df040d 100644
--- a/bootc/scenario1/root/etc/containers/systemd/nextcloud-redis.container
+++ b/bootc/scenario1/root/etc/containers/systemd/nextcloud-redis.container
@@ -6,6 +6,9 @@ After=network.target
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/containers/systemd/configs/nextcloud-config.env
 
+# Start/stop this unit when the target is started/stopped
+PartOf=nextcloud.target
+
 [Container]
 ContainerName=nextcloud-redis
 Image=docker.io/library/redis:8-alpine
diff --git a/bootc/scenario4/root/etc/containers/systemd/odoo-app.container b/bootc/scenario4/root/etc/containers/systemd/odoo-app.container
index 97258fd..0024bbd 100644
--- a/bootc/scenario4/root/etc/containers/systemd/odoo-app.container
+++ b/bootc/scenario4/root/etc/containers/systemd/odoo-app.container
@@ -12,6 +12,9 @@ ConditionPathExists=/etc/containers/systemd/configs/odoo-config.env
 # Only start if initialization has completed
 ConditionPathExists=/var/lib/odoo/initialized
 
+# Start/stop this unit when the target is started/stopped
+PartOf=odoo.target
+
 [Container]
 ContainerName=odoo-app
 Image=docker.io/library/odoo:17
diff --git a/bootc/scenario4/root/etc/containers/systemd/odoo-db.container b/bootc/scenario4/root/etc/containers/systemd/odoo-db.container
index 0d9ca8f..da7990c 100644
--- a/bootc/scenario4/root/etc/containers/systemd/odoo-db.container
+++ b/bootc/scenario4/root/etc/containers/systemd/odoo-db.container
@@ -6,6 +6,9 @@ After=network.target
 # Only start if Odoo has been configured
 ConditionPathExists=/etc/containers/systemd/configs/odoo-config.env
 
+# Start/stop this unit when the target is started/stopped
+PartOf=odoo.target
+
 [Container]
 ContainerName=odoo-db
 Image=docker.io/library/postgres:17-alpine
diff --git a/bootc/scenario4/root/etc/containers/systemd/odoo-init.container b/bootc/scenario4/root/etc/containers/systemd/odoo-init.container
index 159edf6..0fe2ae3 100644
--- a/bootc/scenario4/root/etc/containers/systemd/odoo-init.container
+++ b/bootc/scenario4/root/etc/containers/systemd/odoo-init.container
@@ -12,6 +12,9 @@ ConditionPathExists=/etc/containers/systemd/configs/odoo-config.env
 # Prevent running if already initialized
 ConditionPathExists=!/var/lib/odoo/initialized
 
+# Start/stop this unit when the target is started/stopped
+PartOf=odoo.target
+
 [Container]
 ContainerName=odoo-init
 Image=docker.io/library/odoo:17