diff --git a/contentgrid-spring-data-support/src/main/java/com/contentgrid/spring/data/support/auditing/v1/AuditMetadata.java b/contentgrid-spring-data-support/src/main/java/com/contentgrid/spring/data/support/auditing/v1/AuditMetadata.java
index 0c387596..b9de7d19 100644
--- a/contentgrid-spring-data-support/src/main/java/com/contentgrid/spring/data/support/auditing/v1/AuditMetadata.java
+++ b/contentgrid-spring-data-support/src/main/java/com/contentgrid/spring/data/support/auditing/v1/AuditMetadata.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
 import java.time.Instant;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -19,6 +20,7 @@
 @EqualsAndHashCode
 public class AuditMetadata {
 
+    @Embedded
     @CreatedBy
     @JsonProperty(value = "created_by")
     private UserMetadata createdBy;
@@ -27,6 +29,7 @@ public class AuditMetadata {
     @JsonProperty(value = "created_date")
     private Instant createdDate;
 
+    @Embedded
     @LastModifiedBy
     @JsonProperty(value = "last_modified_by")
     private UserMetadata lastModifiedBy;