diff --git a/gradle.properties b/gradle.properties
index e2eca690e..3d0f03324 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,22 +29,24 @@ org.gradle.java.installations.auto-download=false
 #db = MSSQL
 
 # Enable the SonatypeOS maven repository (mainly for Vert.x snapshots) when present (value ignored)
-#enableSonatypeOpenSourceSnapshotsRep = true
+enableSonatypeOpenSourceSnapshotsRep = true
 
 # Enable the maven local repository (for local development when needed) when present (value ignored)
 #enableMavenLocalRepo = true
 
 # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
-hibernateOrmVersion = 6.6.13.Final
+# I'm not setting a version window here, because the examples will end up using the latest stable version
+# instead of the latest snapshot
+hibernateOrmVersion = 6.6.14-SNAPSHOT
 
 # Override default Hibernate ORM Gradle plugin version
 # Using the stable version because I don't know how to configure the build to download the snapshot version from
 # a remote repository
-#hibernateOrmGradlePluginVersion = 6.6.13.Final
+hibernateOrmGradlePluginVersion = 6.6.13.Final
 
 # If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
 # this is required when using intervals or weird versions or the build will fail
-#skipOrmVersionParsing = true
+skipOrmVersionParsing = true
 
 # Override default Vert.x Sql client version
 #vertxSqlClientVersion = 4.5.14-SNAPSHOT
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveUpdateCoordinatorStandard.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveUpdateCoordinatorStandard.java
index d3237cf72..f0aa8bdc9 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveUpdateCoordinatorStandard.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveUpdateCoordinatorStandard.java
@@ -31,7 +31,7 @@
 import org.hibernate.tuple.entity.EntityMetamodel;
 
 import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identifiedResultsCheck;
-import static org.hibernate.generator.EventType.INSERT;
+import static org.hibernate.generator.EventType.UPDATE;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_INT_ARRAY;
 import static org.hibernate.internal.util.collections.ArrayHelper.trim;
 import static org.hibernate.reactive.persister.entity.mutation.GeneratorValueUtil.generateValue;
@@ -194,7 +194,7 @@ private CompletionStage<int[]> reactivePreUpdateInMemoryValueGeneration(
 						&& generator.generatesOnUpdate() ) {
 					final Object currentValue = currentValues[i];
 					final BeforeExecutionGenerator beforeGenerator = (BeforeExecutionGenerator) generator;
-					result = result.thenCompose( v -> generateValue( session, entity, currentValue, beforeGenerator, INSERT )
+					result = result.thenCompose( v -> generateValue( session, entity, currentValue, beforeGenerator, UPDATE )
 							.thenAccept( generatedValue -> {
 								currentValues[index] = generatedValue;
 								entityPersister().setValue( entity, index, generatedValue );
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/TimestampTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/TimestampTest.java
index 8a6f631fc..7841216c7 100644
--- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/TimestampTest.java
+++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/TimestampTest.java
@@ -6,6 +6,7 @@
 package org.hibernate.reactive;
 
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.List;
@@ -18,6 +19,9 @@
 import io.vertx.junit5.Timeout;
 import io.vertx.junit5.VertxTestContext;
 import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -28,12 +32,11 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Timeout(value = 10, timeUnit = MINUTES)
-
 public class TimestampTest extends BaseReactiveTest {
 
 	@Override
 	protected Collection<Class<?>> annotatedEntities() {
-		return List.of( Record.class );
+		return List.of( Record.class, Event.class );
 	}
 
 	@Test
@@ -56,6 +59,30 @@ public void test(VertxTestContext context) {
 		);
 	}
 
+	@Test
+	public void testEmbedded(VertxTestContext context) {
+		Event event = new Event();
+		History history = new History();
+		event.name = "Concert";
+		test( context, getMutinySessionFactory()
+				.withSession( session -> session.persist( event )
+						.chain( session::flush )
+						.invoke( () -> {
+							history.created = event.history.created;
+							history.updated = event.history.updated;
+							assertEquals(
+									event.history.created.truncatedTo( ChronoUnit.HOURS ),
+									event.history.updated.truncatedTo( ChronoUnit.HOURS )
+							); })
+						.invoke( () -> event.name = "Conference" )
+						.chain( session::flush )
+						.invoke( () -> assertInstants( event, history ) ) )
+				.chain( () -> getMutinySessionFactory().withSession( session -> session
+						.find( Record.class, event.id ) ) )
+				.invoke( r -> assertInstants( event, history ) )
+		);
+	}
+
 	private static void assertInstants(Record r) {
 		assertNotNull( r.created );
 		assertNotNull( r.updated );
@@ -66,6 +93,18 @@ private static void assertInstants(Record r) {
 		);
 	}
 
+	private static void assertInstants(Event e, History h) {
+		assertNotNull( e.history.created );
+		assertNotNull( e.history.updated );
+		// Sometimes, when the test suite is fast enough, they might be the same
+		assertTrue(
+				!e.history.updated.isBefore( e.history.created ),
+				"Updated instant is before created. Updated[" + e.history.updated + "], Created[" + e.history.created + "]"
+		);
+		assertEquals( h.created, e.history.created );
+
+	}
+
 	@Entity(name = "Record")
 	static class Record {
 		@GeneratedValue
@@ -78,4 +117,30 @@ static class Record {
 		@UpdateTimestamp
 		Instant updated;
 	}
+
+	@Entity(name = "Event")
+	static class Event {
+
+		@Id
+		@GeneratedValue
+		public Long id;
+
+		public String name;
+
+		@Embedded
+		public History history;
+
+	}
+
+	@Embeddable
+	static class History {
+		@Column
+		@CreationTimestamp
+		public LocalDateTime created;
+
+		@Column
+		@UpdateTimestamp
+		public LocalDateTime updated;
+
+	}
 }