diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
index 322cfce8b0c..49a8adaf0fc 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
@@ -5127,16 +5127,10 @@
 
         <Component ID="DOOR_PANEL">
             <UseTemplate Name="A32NX_SWITCH_DOORPANEL_LOCK">
-                <NODE_ID>LOCK_DOOR_LCKG_SYS</NODE_ID>
-                <ANIM_NAME>LOCK_DOOR_LCKG_SYS</ANIM_NAME>
+                <NODE_ID>SWITCH_DOOR_LOCK</NODE_ID>
+                <ANIM_NAME>SWITCH_DOOR_LOCK</ANIM_NAME>
                 <INVERT_ANIM>1</INVERT_ANIM>
             </UseTemplate>
-            <UseTemplate Name="A32NX_PUSH_DOORPANEL_OPEN">
-                <NODE_ID>PUSH_DOOR_LCKG_SYS</NODE_ID>
-                <ANIM_NAME>PUSH_DOOR_LCKG_SYS</ANIM_NAME>
-                <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
-                <SEQ2_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
-            </UseTemplate>
         </Component>
 
         <Component ID="Chronometer">
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/door_animations.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/door_animations.xml
index 5bf566fc37f..703e011f523 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/door_animations.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/door_animations.xml
@@ -22,13 +22,11 @@
             <UseTemplate Name="ASOBO_GT_Anim_Code">
                 <ANIM_NAME>ANIM_DOOR_#DOOR_ID#_ARMED</ANIM_NAME>
                 <ANIM_LAG>100</ANIM_LAG>
-			    <ANIM_CODE>(A:INTERACTIVE POINT OPEN:#ID#, Percent)</ANIM_CODE>
+			    <ANIM_CODE>(L:ANIM_DOOR_#DOOR_ID#_DISARMED) 100 *</ANIM_CODE>
 			</UseTemplate>
             <UseTemplate Name="ASOBO_GT_Interaction_LeftSingle_Leave_Code">
                 <LEFT_SINGLE_CODE>
-                    (L:A32NX_PRESS_MAN_CABIN_DELTA_PRESSURE, psi) 0.8 &lt; (A:INTERACTIVE POINT OPEN:#ID#, Percent) 0 &gt; || if{
-                        #TOGGLE_ID# (&gt;K:TOGGLE_AIRCRAFT_EXIT)
-                    }
+                    (L:ANIM_DOOR_#DOOR_ID#_DISARMED) ! (&gt;L:ANIM_DOOR_#DOOR_ID#_DISARMED)
                 </LEFT_SINGLE_CODE>
                 <TOOLTIPID>A380X.TOOLTIPS.DOORS_ARM_DISARM</TOOLTIPID>
             </UseTemplate>