diff --git a/spp_area/data/area_kind_data.xml b/spp_area/data/area_kind_data.xml
index faaaee6d..d663c88d 100644
--- a/spp_area/data/area_kind_data.xml
+++ b/spp_area/data/area_kind_data.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-    <data noupdate="1">
-        <record id="admin_area_kind" model="spp.area.kind">
-            <field name="name">Admin Area</field>
-        </record>
-    </data>
-
+<odoo noupdate="1">
+    <record id="admin_area_kind" model="spp.area.kind">
+        <field name="name">Admin Area</field>
+    </record>
 </odoo>
diff --git a/spp_idpass/data/id_pass.xml b/spp_idpass/data/id_pass.xml
index f2e88f28..29e1ae8a 100644
--- a/spp_idpass/data/id_pass.xml
+++ b/spp_idpass/data/id_pass.xml
@@ -1,16 +1,12 @@
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
+    <!-- ID Type: ID Pass -->
+    <record id="id_type_idpass" model="g2p.id.type">
+        <field name="name">ID PASS Lite</field>
+        <field name="target_type">both</field>
+    </record>
 
-        <!-- ID Type: ID Pass -->
-        <record id="id_type_idpass" model="g2p.id.type">
-            <field name="name">ID PASS Lite</field>
-            <field name="target_type">both</field>
-        </record>
-
-        <record id="id_template_idpass" model="spp.id.pass">
-            <field name="name">ID PASS Template</field>
-            <field name="id_type" ref="id_type_idpass" />
-        </record>
-
-    </data>
+    <record id="id_template_idpass" model="spp.id.pass">
+        <field name="name">ID PASS Template</field>
+        <field name="id_type" ref="id_type_idpass" />
+    </record>
 </odoo>
diff --git a/spp_idqueue/data/id_pass.xml b/spp_idqueue/data/id_pass.xml
index ae61e918..a528ada1 100644
--- a/spp_idqueue/data/id_pass.xml
+++ b/spp_idqueue/data/id_pass.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-    <data noupdate="1">
-        <!-- ID Template: Batch Print -->
-        <record id="id_template_batch_print" model="spp.id.pass">
-            <field name="name">ID Batch Print</field>
-        </record>
-    </data>
-
+<odoo noupdate="1">
+    <!-- ID Template: Batch Print -->
+    <record id="id_template_batch_print" model="spp.id.pass">
+        <field name="name">ID Batch Print</field>
+    </record>
 </odoo>
diff --git a/spp_scan_id_document/tests/test_registrant.py b/spp_scan_id_document/tests/test_registrant.py
index ea153a36..502e9fe7 100644
--- a/spp_scan_id_document/tests/test_registrant.py
+++ b/spp_scan_id_document/tests/test_registrant.py
@@ -72,4 +72,4 @@ def test_scan_id_document_details_vals(self):
                 vals.get("gender"),
                 vals.get("birth_place"),
             ],
-        )
\ No newline at end of file
+        )