diff --git a/recipes-core/images/stm32mp15x-demo-image.bb b/recipes-core/images/stm32mp15x-demo-image.bb
index 5c47eda..eb67968 100644
--- a/recipes-core/images/stm32mp15x-demo-image.bb
+++ b/recipes-core/images/stm32mp15x-demo-image.bb
@@ -11,6 +11,8 @@ IMAGE_INSTALL += "\
     libp11 \
     softhsm \
     cryptsetup \
+    systemd-crypt \
+    systemd-container \
     keyutils \
     curl \
     strace \
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..5e3fa65
--- /dev/null
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,3 @@
+PACKAGECONFIG:append = " cryptsetup cryptsetup-plugins"
+
+RRECOMMENDS:${PN} += "systemd-crypt systemd-container"