diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
index a4cd962c..8c472f20 100644
--- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
+++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
@@ -153,4 +153,13 @@ class CfgBaseBuilding {
 	{
 		removeParts[] = { { "PartPlankPack", 2 } };
 	};
+
+	class LockBox_EPOCH : Default
+	{
+		returnOnPack[] = { { "ItemLockbox", 1 } };
+	}
+	class Safe_EPOCH : Default
+	{
+		returnOnPack[] = { { "ItemSafe", 1 } };
+	}
 };
diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf
index f746c74b..f668ba8e 100644
--- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf
+++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf
@@ -51,7 +51,7 @@ if (_class isKindOf 'Constructions_lockedstatic_F') then {
 		_gwh = createVehicle["groundWeaponHolder", _posWH, [], 0, "CAN_COLLIDE"];
 		_gwh setPosATL _posWH;
 
-		_returnItems = getArray(configFile >> "CfgVehicles" >> _class >> "returnOnPack");
+		_returnItems = getArray(configFile >> "CfgBaseBuilding" >> _class >> "returnOnPack");
 		{
 			_gwh addMagazineCargoGlobal _x;
 		} forEach _returnItems;