diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index d0963f74ab6724..7e39cbf73ffaea 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -101,7 +101,7 @@
              bytebuddy.version (just below), hibernate-orm.version-for-documentation (in docs/pom.xml)
              and antlr.version.version in build-parent/pom.xml
              WARNING again for diffs that don't provide enough context: when updating, see above -->
-        <hibernate-orm.version>6.3.1.Final</hibernate-orm.version>
+        <hibernate-orm.version>6.4.0.CR1</hibernate-orm.version>
         <bytebuddy.version>1.14.7</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
         <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM -->
         <hibernate-reactive.version>2.0.6.Final</hibernate-reactive.version>
@@ -190,7 +190,7 @@
         <quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
         <mockito.version>5.3.1</mockito.version>
         <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
-        <antlr.version>4.10.1</antlr.version><!-- needs to align with same property in build-parent/pom.xml -->
+        <antlr.version>4.13.0</antlr.version><!-- needs to align with same property in build-parent/pom.xml -->
         <quarkus-security.version>2.0.2.Final</quarkus-security.version>
         <keycloak.version>22.0.5</keycloak.version>
         <logstash-gelf.version>1.15.1</logstash-gelf.version>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index bd06d38ef306f4..5c932db050ebdd 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -72,7 +72,7 @@
         <!-- MicroProfile TCK versions used to be defined here but have moved to the concrete tck modules -->
 
         <!-- Antlr 4 is used by the PanacheQL parser but also needs to match the requirements of Hibernate ORM 6.x-->
-        <antlr.version>4.10.1</antlr.version>
+        <antlr.version>4.13.0</antlr.version>
 
         <!-- SELinux access label, used when mounting local volumes into containers in tests -->
         <volume.access.modifier>:Z</volume.access.modifier>
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java
index 9cf8734dfa33ea..e21152cf216c1b 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java
@@ -36,6 +36,7 @@ private HibernateOrmTypes() {
             DotName.createSimple("org.hibernate.annotations.NamedNativeQuery"),
             DotName.createSimple("org.hibernate.annotations.NamedQueries"),
             DotName.createSimple("org.hibernate.annotations.NamedQuery"),
+            DotName.createSimple("org.hibernate.annotations.SoftDelete"),
             DotName.createSimple("org.hibernate.annotations.TypeRegistration"),
             DotName.createSimple("org.hibernate.annotations.TypeRegistrations"));
 
@@ -301,6 +302,7 @@ private HibernateOrmTypes() {
             DotName.createSimple("org.hibernate.annotations.SecondaryRow"),
             DotName.createSimple("org.hibernate.annotations.SecondaryRows"),
             DotName.createSimple("org.hibernate.annotations.SelectBeforeUpdate"),
+            DotName.createSimple("org.hibernate.annotations.SoftDelete"),
             DotName.createSimple("org.hibernate.annotations.SortComparator"),
             DotName.createSimple("org.hibernate.annotations.SortNatural"),
             DotName.createSimple("org.hibernate.annotations.Source"),
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java
index 41f7ab0f524894..fa815d3fe5d43d 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java
@@ -121,6 +121,11 @@ public String getTenantIdentifier() {
         return delegate.get().getTenantIdentifier();
     }
 
+    @Override
+    public Object getTenantIdentifierValue() {
+        return delegate.get().getTenantIdentifier();
+    }
+
     @Override
     public boolean isOpen() {
         return delegate.get().isOpen();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java
index d526ce46b059e4..9541b03d0bb8cc 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java
@@ -1142,6 +1142,13 @@ public String getTenantIdentifier() {
         }
     }
 
+    @Override
+    public Object getTenantIdentifierValue() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getTenantIdentifierValue();
+        }
+    }
+
     @Override
     public boolean isConnected() {
         checkBlocking();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java
index 7ae85355ffeb8f..c20c509377e646 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java
@@ -401,6 +401,13 @@ public String getTenantIdentifier() {
         }
     }
 
+    @Override
+    public Object getTenantIdentifierValue() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.statelessSession.getTenantIdentifierValue();
+        }
+    }
+
     @Override
     public boolean isConnected() {
         checkBlocking();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
index 1989224a064068..66d38d64247913 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
@@ -15,7 +15,8 @@
  * @author Michael Schnell
  *
  */
-public final class HibernateCurrentTenantIdentifierResolver implements CurrentTenantIdentifierResolver {
+// TODO support other tenant ID types than String; see https://github.com/quarkusio/quarkus/issues/36831
+public final class HibernateCurrentTenantIdentifierResolver implements CurrentTenantIdentifierResolver<String> {
 
     private static final Logger LOG = Logger.getLogger(HibernateCurrentTenantIdentifierResolver.class);
 
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
index f29c007142fd44..8ea5f7ac188f40 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
@@ -23,7 +23,8 @@
  *
  * @author Michael Schnell
  */
-public final class HibernateMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider {
+// TODO support other tenant ID types than String; see https://github.com/quarkusio/quarkus/issues/36831
+public final class HibernateMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider<String> {
 
     private static final Logger LOG = Logger.getLogger(HibernateMultiTenantConnectionProvider.class);