diff --git a/config/doctrine/model/DoubleOptInSession.orm.xml b/config/doctrine/model/DoubleOptInSession.orm.xml
new file mode 100644
index 00000000..102e535e
--- /dev/null
+++ b/config/doctrine/model/DoubleOptInSession.orm.xml
@@ -0,0 +1,28 @@
+<?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="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="FormBuilderBundle\Model\DoubleOptInSession" table="formbuilder_double_opt_in_session">
+        <indexes>
+            <index name="token_form" columns="token,form_definition,applied"/>
+        </indexes>
+        <id name="token" type="uuid" column="token">
+            <generator strategy="CUSTOM"/>
+            <custom-id-generator class="Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator"/>
+        </id>
+        <field name="email" type="string" column="email" length="190" nullable="false"/>
+        <field name="additionalData" type="array" column="additional_data" nullable="true"/>
+        <field name="dispatchLocation" type="text" column="dispatch_location" nullable="true"/>
+        <field name="applied" type="boolean" column="applied">
+            <options>
+                <option name="default">0</option>
+            </options>
+        </field>
+        <field name="creationDate" type="datetime" column="creationDate" nullable="false"/>
+        <many-to-one field="formDefinition" target-entity="FormBuilderBundle\Model\FormDefinition" fetch="LAZY">
+            <join-columns>
+                <join-column name="form_definition" referenced-column-name="id" on-delete="CASCADE"/>
+            </join-columns>
+        </many-to-one>
+    </entity>
+</doctrine-mapping>
diff --git a/config/doctrine/model/DoubleOptInSession.orm.yml b/config/doctrine/model/DoubleOptInSession.orm.yml
deleted file mode 100644
index ab5aff9c..00000000
--- a/config/doctrine/model/DoubleOptInSession.orm.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-FormBuilderBundle\Model\DoubleOptInSession:
-    type: entity
-    table: formbuilder_double_opt_in_session
-    indexes:
-        token_form:
-            columns: [ token, form_definition, applied ]
-    id:
-        token:
-            unique: true
-            column: token
-            type: uuid
-            generator:
-                strategy: CUSTOM
-            customIdGenerator:
-                class: Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator
-    fields:
-        email:
-            column: email
-            type: string
-            nullable: false
-            length: 190
-        additionalData:
-            column: additional_data
-            type: array
-            nullable: true
-        dispatchLocation:
-            column: dispatch_location
-            type: text
-            nullable: true
-        applied:
-            column: applied
-            type: boolean
-            options:
-                default: 0
-        creationDate:
-            column: creationDate
-            type: datetime
-            nullable: false
-    manyToOne:
-        formDefinition:
-            targetEntity: FormBuilderBundle\Model\FormDefinition
-            orphanRemoval: true
-            joinColumn:
-                name: form_definition
-                referencedColumnName: id
-                onDelete: CASCADE
\ No newline at end of file
diff --git a/config/doctrine/model/FormDefinition.orm.xml b/config/doctrine/model/FormDefinition.orm.xml
new file mode 100644
index 00000000..387884d3
--- /dev/null
+++ b/config/doctrine/model/FormDefinition.orm.xml
@@ -0,0 +1,25 @@
+<?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="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="FormBuilderBundle\Model\FormDefinition" table="formbuilder_forms">
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
+        </id>
+        <field name="name" type="string" column="`name`" length="190" unique="true" nullable="true"/>
+        <field name="group" type="string" column="`group`" length="190" nullable="true"/>
+        <field name="creationDate" type="datetime" column="creationDate" nullable="false"/>
+        <field name="modificationDate" type="datetime" column="modificationDate" nullable="false"/>
+        <field name="createdBy" type="integer" column="createdBy"/>
+        <field name="modifiedBy" type="integer" column="modifiedBy"/>
+        <field name="configuration" type="object" column="configuration" nullable="true"/>
+        <field name="conditionalLogic" type="object" column="conditionalLogic" nullable="true"/>
+        <field name="fields" type="form_builder_fields" column="fields" nullable="true"/>
+        <one-to-many field="outputWorkflows" target-entity="FormBuilderBundle\Model\OutputWorkflow" mapped-by="formDefinition"
+                     fetch="LAZY">
+            <cascade>
+                <cascade-all/>
+            </cascade>
+        </one-to-many>
+    </entity>
+</doctrine-mapping>
diff --git a/config/doctrine/model/FormDefinition.orm.yml b/config/doctrine/model/FormDefinition.orm.yml
deleted file mode 100644
index 9812401d..00000000
--- a/config/doctrine/model/FormDefinition.orm.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-FormBuilderBundle\Model\FormDefinition:
-    type: entity
-    table: formbuilder_forms
-    fields:
-        id:
-            type: integer
-            column: id
-            id: true
-            generator:
-                strategy: AUTO
-        name:
-            column: '`name`'
-            nullable: true
-            type: string
-            unique: true
-            length: 190
-        group:
-            column: '`group`'
-            nullable: true
-            type: string
-            length: 190
-        creationDate:
-            column: creationDate
-            type: datetime
-            nullable: false
-        modificationDate:
-            column: modificationDate
-            type: datetime
-            nullable: false
-        createdBy:
-            column: createdBy
-            type: integer
-        modifiedBy:
-            column: modifiedBy
-            type: integer
-        configuration:
-            column: configuration
-            type: object
-            nullable: true
-        conditionalLogic:
-            column: conditionalLogic
-            type: object
-            nullable: true
-        fields:
-            column: fields
-            type: form_builder_fields
-            nullable: true
-    oneToMany:
-        outputWorkflows:
-            targetEntity: FormBuilderBundle\Model\OutputWorkflow
-            mappedBy: formDefinition
-            cascade:
-                - all
\ No newline at end of file
diff --git a/config/doctrine/model/OutputWorkflow.orm.xml b/config/doctrine/model/OutputWorkflow.orm.xml
new file mode 100644
index 00000000..fb1cc614
--- /dev/null
+++ b/config/doctrine/model/OutputWorkflow.orm.xml
@@ -0,0 +1,31 @@
+<?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="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="FormBuilderBundle\Model\OutputWorkflow" table="formbuilder_output_workflow">
+        <unique-constraints>
+            <unique-constraint name="name_form" columns="name,form_definition"/>
+        </unique-constraints>
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
+        </id>
+        <field name="name" type="string" column="`name`" length="190" nullable="true"/>
+        <field name="funnelWorkflow" type="boolean" column="funnel_workflow" nullable="false"/>
+        <field name="successManagement" type="object" column="success_management" nullable="true"/>
+        <one-to-many field="channels" target-entity="FormBuilderBundle\Model\OutputWorkflowChannel" mapped-by="outputWorkflow"
+                     orphan-removal="true" fetch="LAZY">
+            <cascade>
+                <cascade-all/>
+            </cascade>
+            <order-by>
+                <order-by-field name="id" direction="ASC"/>
+            </order-by>
+        </one-to-many>
+        <many-to-one field="formDefinition" target-entity="FormBuilderBundle\Model\FormDefinition" inversed-by="outputWorkflows"
+                     fetch="LAZY">
+            <join-columns>
+                <join-column name="form_definition" referenced-column-name="id"/>
+            </join-columns>
+        </many-to-one>
+    </entity>
+</doctrine-mapping>
diff --git a/config/doctrine/model/OutputWorkflow.orm.yml b/config/doctrine/model/OutputWorkflow.orm.yml
deleted file mode 100644
index 3cedb92a..00000000
--- a/config/doctrine/model/OutputWorkflow.orm.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-FormBuilderBundle\Model\OutputWorkflow:
-    type: entity
-    table: formbuilder_output_workflow
-    fields:
-        id:
-            type: integer
-            column: id
-            id: true
-            generator:
-                strategy: AUTO
-        name:
-            column: '`name`'
-            nullable: true
-            type: string
-            length: 190
-        funnelWorkflow:
-            column: funnel_workflow
-            nullable: false
-            type: boolean
-        successManagement:
-            column: success_management
-            nullable: true
-            type: object
-    manyToOne:
-        formDefinition:
-            targetEntity: FormBuilderBundle\Model\FormDefinition
-            orphanRemoval: true
-            inversedBy: outputWorkflows
-            joinColumn:
-                name: form_definition
-                referencedColumnName: id
-    oneToMany:
-        channels:
-            targetEntity: FormBuilderBundle\Model\OutputWorkflowChannel
-            orphanRemoval: true
-            mappedBy: outputWorkflow
-            orderBy:
-                id: ASC
-            cascade:
-                - all
-    uniqueConstraints:
-        name_form:
-            columns: [name, form_definition]
\ No newline at end of file
diff --git a/config/doctrine/model/OutputWorkflowChannel.orm.xml b/config/doctrine/model/OutputWorkflowChannel.orm.xml
new file mode 100644
index 00000000..0df61746
--- /dev/null
+++ b/config/doctrine/model/OutputWorkflowChannel.orm.xml
@@ -0,0 +1,23 @@
+<?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="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="FormBuilderBundle\Model\OutputWorkflowChannel" table="formbuilder_output_workflow_channel">
+        <unique-constraints>
+            <unique-constraint name="ow_name" columns="output_workflow,name"/>
+        </unique-constraints>
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
+        </id>
+        <field name="type" type="string" column="type" length="190"/>
+        <field name="name" type="string" column="name" length="190"/>
+        <field name="configuration" type="object" column="configuration" nullable="true"/>
+        <field name="funnelActions" type="object" column="funnel_actions" nullable="true"/>
+        <many-to-one field="outputWorkflow" target-entity="FormBuilderBundle\Model\OutputWorkflow" inversed-by="channels"
+                     fetch="LAZY">
+            <join-columns>
+                <join-column name="output_workflow" referenced-column-name="id"/>
+            </join-columns>
+        </many-to-one>
+    </entity>
+</doctrine-mapping>
diff --git a/config/doctrine/model/OutputWorkflowChannel.orm.yml b/config/doctrine/model/OutputWorkflowChannel.orm.yml
deleted file mode 100644
index b8845085..00000000
--- a/config/doctrine/model/OutputWorkflowChannel.orm.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-FormBuilderBundle\Model\OutputWorkflowChannel:
-    type: entity
-    table: formbuilder_output_workflow_channel
-    fields:
-        id:
-            type: integer
-            column: id
-            id: true
-            generator:
-                strategy: AUTO
-        type:
-            column: type
-            type: string
-            length: 190
-        name:
-            column: name
-            type: string
-            length: 190
-        configuration:
-            column: configuration
-            nullable: true
-            type: object
-        funnelActions:
-            column: funnel_actions
-            nullable: true
-            type: object
-    manyToOne:
-        outputWorkflow:
-            targetEntity: FormBuilderBundle\Model\OutputWorkflow
-            inversedBy: channels
-            joinColumn:
-                name: output_workflow
-                referencedColumnName: id
-    uniqueConstraints:
-        ow_name:
-            columns: [ output_workflow, name ]
\ No newline at end of file
diff --git a/src/FormBuilderBundle.php b/src/FormBuilderBundle.php
index d9c1f4e2..47daa27a 100644
--- a/src/FormBuilderBundle.php
+++ b/src/FormBuilderBundle.php
@@ -91,7 +91,7 @@ protected function getComposerPackageName(): string
     protected function configureDoctrineExtension(ContainerBuilder $container): void
     {
         $container->addCompilerPass(
-            DoctrineOrmMappingsPass::createYamlMappingDriver(
+            DoctrineOrmMappingsPass::createXmlMappingDriver(
                 [$this->getNameSpacePath() => $this->getNamespaceName()],
                 ['form_builder.persistence.doctrine.manager'],
                 'form_builder.persistence.doctrine.enabled'