diff --git a/stammdaten_gebaeude.xml b/stammdaten_gebaeude.xml
index 40965d1..10c489c 100644
--- a/stammdaten_gebaeude.xml
+++ b/stammdaten_gebaeude.xml
@@ -4,7 +4,7 @@
     <h:title>Stammdaten Gebäude</h:title>
     <model odk:xforms-version="1.0.0" entities:entities-version="2024.1.0">
       <instance>
-        <data id="stammdaten_gebaeude" version="2025-10-09-1-v2-entities1-rename-aktiv2_v2_v3">
+        <data id="stammdaten_gebaeude" version="V1">
           <gebaeude_modus/>
           <gebaeude_bearbeiten/>
           <start/>
@@ -139,10 +139,9 @@
       <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" jr:preload="uid"/>
       <bind nodeset="/data/meta/instanceName" type="string" calculate="concat( /data/kopf/strasse_hausnr , ', ',  /data/kopf/plz , ' ',  /data/kopf/ort )"/>
       <bind nodeset="/data/meta/entity/@create" calculate="true()"/>
-      <bind nodeset="/data/meta/entity/@id"/>
-      <bind nodeset="/data/meta/entity/@update" calculate="false()"/>
+      <bind nodeset="/data/meta/entity/@id" type="string" readonly="true()" calculate="once(uuid())"/><bind nodeset="/data/meta/entity/@update" calculate="false()"/>
       <bind nodeset="/data/meta/entity/label" calculate="concat(/data/kopf/objekt_nr, ' - ', /data/kopf/objekt_name)" type="string" readonly="true()"/>
-      <bind nodeset="/data/meta/entity" entities:dataset="gebaeude"/><bind nodeset="/data/meta/entity" entities:dataset="gebaeude"/><bind nodeset="/data/meta/entity/@id" calculate="if(/data/meta/entity/@id = '', uuid(), /data/meta/entity/@id)"/><setvalue ref="/data/meta/entity/@id" event="odk-instance-first-load" value="if(/data/meta/entity/@id = '', uuid(), /data/meta/entity/@id)"/><setvalue ref="/data/meta/entity/@id" event="xforms-ready" value="if(/data/meta/entity/@id = '', uuid(), /data/meta/entity/@id)"/><setvalue ref="/data/meta/entity/@create" event="xforms-ready" value="'true'"/><setvalue ref="/data/meta/entity/@update" event="xforms-ready" value="'false'"/><bind nodeset="/data/meta/entity/label" calculate="concat(/data/kopf/objekt_nr, ' - ', /data/kopf/objekt_name)"/></model>
+      <bind nodeset="/data/meta/entity" entities:dataset="gebaeude"/><bind nodeset="/data/meta/entity" entities:dataset="gebaeude"/><setvalue ref="/data/meta/entity/@create" event="xforms-ready" value="'true'"/><setvalue ref="/data/meta/entity/@update" event="xforms-ready" value="'false'"/><bind nodeset="/data/meta/entity/label" calculate="concat(/data/kopf/objekt_nr, ' - ', /data/kopf/objekt_name)"/></model>
   </h:head>
   <h:body>
     <group ref="/data/kopf">