diff --git a/src/libpriv/rpmostree-core.cxx b/src/libpriv/rpmostree-core.cxx
index 3a13b498de..965d58091a 100644
--- a/src/libpriv/rpmostree-core.cxx
+++ b/src/libpriv/rpmostree-core.cxx
@@ -4713,6 +4713,19 @@ rpmostree_context_commit (RpmOstreeContext *self, const char *parent,
         if (!ostree_commit_metadata_for_bootable (root, metadata_dict, cancellable, error))
           return FALSE;
       }
+#if OSTREE_CHECK_VERSION(2023, 4)
+    {
+      g_autoptr (GError) local_error = NULL;
+      if (!ostree_repo_commit_add_composefs_metadata (
+              self->ostreerepo, 0, metadata_dict, (OstreeRepoFile *)root, cancellable, &local_error)
+          && !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+        {
+          g_propagate_prefixed_error (error, util::move_nullify (local_error),
+                                      "Adding composefs metadata");
+          return FALSE;
+        }
+    }
+#endif
     g_autoptr (GVariant) metadata = g_variant_dict_end (metadata_dict);
 
     {
diff --git a/tests/kolainst/destructive/layering-local b/tests/kolainst/destructive/layering-local
index ca03ceea4c..8ba5a84378 100755
--- a/tests/kolainst/destructive/layering-local
+++ b/tests/kolainst/destructive/layering-local
@@ -76,6 +76,9 @@ fi
 ostree show --print-metadata-key=ostree.bootable ${booted_commit} >out.txt
 assert_file_has_content_literal out.txt 'true'
 echo "ok bootable metadata"
+ostree show --print-metadata-key=ostree.composefs.digest.v0 ${booted_commit} >out.txt
+assert_file_has_content_literal out.txt 'byte'
+echo "ok composefs metadata on client generated commit"
 
 # check we could uninstall the package using either its NEVRA or name
 rpm-ostree uninstall foo-1.2-3.x86_64