diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
index c6adc8768..48aca6383 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
@@ -10420,11 +10420,14 @@ Object Chem_GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
index b1ddda37c..be125cc74 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
@@ -10364,11 +10364,14 @@ Object Demo_GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
index 6ce141b0c..b600c2419 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini
@@ -26846,11 +26846,14 @@ Object GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
@@ -36305,11 +36308,14 @@ Object GLAArmsDealerNoHole
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
index be4f1daf0..da6f3f8c2 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLABuildings.ini
@@ -4316,11 +4316,14 @@ Object GC_Chem_GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
index eaf44bf62..b6e1bd77f 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLABuildings.ini
@@ -4186,11 +4186,14 @@ Object GC_Slth_GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
index cc7829dd2..8611bd666 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
@@ -11056,11 +11056,14 @@ Object Slth_GLAArmsDealer
   Behavior             = FXListDie ModuleTag_09
     DeathFX       = FX_StructureMediumDeath
   End
+
+  ; Patch104p @bugfix commy2 09/10/2021 Fix door not closing in time when building Technicals or Combat Bikes with power.
+
   Behavior = ProductionUpdate ModuleTag_10
     NumDoorAnimations            = 1
     DoorOpeningTime              = 2000  ;in mSeconds
-    DoorWaitOpenTime             = 3000  ;in mSeconds
-    DoorCloseTime                = 2000  ;in mSeconds
+    DoorWaitOpenTime             = 2000  ;in mSeconds
+    DoorCloseTime                = 1800  ;in mSeconds
     ConstructionCompleteDuration = 1500  ;in mSeconds
   End
   Behavior = DefaultProductionExitUpdate ModuleTag_11