diff --git a/diskimage_builder/elements/gentoo/finalise.d/99-cleanup b/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
index 4df7841f6..32a89bf4c 100755
--- a/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
+++ b/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
@@ -55,3 +55,8 @@ if [[ -a /usr/sbin/grub2-install ]]; then
 fi
 
 unfix_shm
+
+# systemd id
+if [[ "${GENTOO_PROFILE}" == *"systemd"* ]]; then
+    cp /dev/null /etc/machine-id
+fi
diff --git a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
index 57166ec42..ed70276bb 100755
--- a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
+++ b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
@@ -51,12 +51,16 @@ elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/hardened" ]]; then
 elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib/hardened" ]]; then
     FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
     SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/systemd" ]]; then
+    FILENAME_BASE='gentoo-stage4-systemd'
+    SIGNED_SOURCE_SUFFIX='systemd'
 else
     echo 'invalid profile, please select from the following profiles'
     echo 'default/linux/amd64/17.0'
     echo 'default/linux/amd64/17.0/no-multilib'
     echo 'default/linux/amd64/17.0/hardened'
     echo 'default/linux/amd64/17.0/no-multilib/hardened'
+    echo 'default/linux/amd64/17.0/systemd'
     exit 1
 fi