diff --git a/cdist/conf/type/__install_generate_fstab/gencode-local b/cdist/conf/type/__install_generate_fstab/gencode-local
index 4c9a87b9..5dfc0249 100755
--- a/cdist/conf/type/__install_generate_fstab/gencode-local
+++ b/cdist/conf/type/__install_generate_fstab/gencode-local
@@ -25,7 +25,7 @@ mkdir "$__object/files"
 # get current UUID's from target_host
 $__remote_exec $__target_host blkid > "$__object/files/blkid"
 
-for object in $(find "$__global/object/__install_mount" -path "*.cdist-*"); do
+for object in $(find "$__global/object/__install_mount" -type d -name "$__cdist_object_marker"); do
    device="$(cat "$object/parameter/device")"
    dir="$(cat "$object/parameter/dir")"
    prefix="$(cat "$object/parameter/prefix")"
diff --git a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
index 00cff3d3..e9ec588b 100755
--- a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
+++ b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
@@ -57,7 +57,7 @@ size_to_mb() {
 
 get_objects() {
    objects_file=$(mktemp)
-   for object in $(find "$__global/object/__install_partition_msdos" -path "*.cdist-*"); do
+   for object in $(find "$__global/object/__install_partition_msdos" -type d -name "$__cdist_object_marker"); do
       object_device="$(cat "$object/parameter/device")"
       object_minor="$(cat "$object/parameter/minor")"
       echo "$object_device $object_minor $object" >> $objects_file