diff --git a/docs/reference/installation.rst b/docs/reference/installation.rst
index f43353c4c..f318a65a8 100644
--- a/docs/reference/installation.rst
+++ b/docs/reference/installation.rst
@@ -82,6 +82,7 @@ And then create the corresponding entity, ``src/Entity/SonataUserUser``::
     use Doctrine\DBAL\Types\Types;
     use Doctrine\ORM\Mapping as ORM;
     use Sonata\UserBundle\Entity\BaseUser;
+    // or `Sonata\UserBundle\Entity\BaseUser3` as BaseUser if you upgrade to doctrine/orm ^3
 
     #[ORM\Entity]
     #[ORM\Table(name: 'user__user')]
diff --git a/src/Entity/BaseUser3.php b/src/Entity/BaseUser3.php
new file mode 100644
index 000000000..042350969
--- /dev/null
+++ b/src/Entity/BaseUser3.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\UserBundle\Entity;
+
+class BaseUser3 extends BaseUser
+{
+}
diff --git a/src/Resources/config/doctrine/BaseUser.orm.xml b/src/Resources/config/doctrine/BaseUser.orm.xml
index 11d5ec41f..92ae3d230 100644
--- a/src/Resources/config/doctrine/BaseUser.orm.xml
+++ b/src/Resources/config/doctrine/BaseUser.orm.xml
@@ -11,7 +11,7 @@
         <field name="lastLogin" column="last_login" type="datetime" nullable="true"/>
         <field name="confirmationToken" column="confirmation_token" type="string" length="180" unique="true" nullable="true"/>
         <field name="passwordRequestedAt" column="password_requested_at" type="datetime" nullable="true"/>
-        <field name="roles" column="roles" type="json"/>
+        <field name="roles" column="roles" type="array"/>
         <field name="createdAt" type="datetime" column="created_at"/>
         <field name="updatedAt" type="datetime" column="updated_at"/>
         <lifecycle-callbacks>
diff --git a/src/Resources/config/doctrine/BaseUser.orm3.xml b/src/Resources/config/doctrine/BaseUser.orm3.xml
new file mode 100644
index 000000000..6ebf323c6
--- /dev/null
+++ b/src/Resources/config/doctrine/BaseUser.orm3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <mapped-superclass name="Sonata\UserBundle\Entity\BaseUser3">
+        <field name="username" column="username" type="string" length="180"/>
+        <field name="usernameCanonical" column="username_canonical" type="string" length="180" unique="true"/>
+        <field name="email" column="email" type="string" length="180"/>
+        <field name="emailCanonical" column="email_canonical" type="string" length="180" unique="true"/>
+        <field name="enabled" column="enabled" type="boolean"/>
+        <field name="salt" column="salt" type="string" nullable="true"/>
+        <field name="password" column="password" type="string"/>
+        <field name="lastLogin" column="last_login" type="datetime" nullable="true"/>
+        <field name="confirmationToken" column="confirmation_token" type="string" length="180" unique="true" nullable="true"/>
+        <field name="passwordRequestedAt" column="password_requested_at" type="datetime" nullable="true"/>
+        <field name="roles" column="roles" type="json"/>
+        <field name="createdAt" type="datetime" column="created_at"/>
+        <field name="updatedAt" type="datetime" column="updated_at"/>
+        <lifecycle-callbacks>
+            <lifecycle-callback type="prePersist" method="prePersist"/>
+            <lifecycle-callback type="preUpdate" method="preUpdate"/>
+        </lifecycle-callbacks>
+    </mapped-superclass>
+</doctrine-mapping>