diff --git a/Code/functions/Server/fn_initServer.sqf b/Code/functions/Server/fn_initServer.sqf
index de34ece3..2e5d6963 100644
--- a/Code/functions/Server/fn_initServer.sqf
+++ b/Code/functions/Server/fn_initServer.sqf
@@ -674,6 +674,13 @@ call A3E_fnc_InitTraps;
 	};
 };
 
+a3e_arr_Escape_MilitaryTraffic_CivilianCrewClasses = '
+	configName _x isKindOf "CAManBase"
+	&& {getNumber (_x >> "scope") == 2}
+	&& {getText (_x >> "vehicleClass") != "MenVR"}
+	&& {getNumber (_x >> "side") == 3}
+	&& {-1 == toLower (getArray (_x >> "hiddenSelectionsTextures") param [0, ""]) find "c_poloshirt_3_co.paa"}
+' configClasses (configFile >> "CfgVehicles") apply {configName _x};
 
 //["A3E_FNC_AmbientAISpawn"] call A3E_FNC_Chronos_Register;
 ["A3E_FNC_RoadBlocks"] call A3E_FNC_Chronos_Register;
diff --git a/Code/functions/Spawning/fn_SpawnCivilianVehicle.sqf b/Code/functions/Spawning/fn_SpawnCivilianVehicle.sqf
index a114682b..17c075a0 100644
--- a/Code/functions/Spawning/fn_SpawnCivilianVehicle.sqf
+++ b/Code/functions/Spawning/fn_SpawnCivilianVehicle.sqf
@@ -25,6 +25,21 @@ private _vehicle = _result select 0;
 private _vehiclesCrew = _result select 1;
 private _group = _result select 2;
 
+// replace unit with random class
+private _class = selectRandom a3e_arr_Escape_MilitaryTraffic_CivilianCrewClasses;
+private _newDriver = _group createUnit [_class, _pos, [] , 0, "NONE"];
+private _driver = driver _vehicle;
+moveOut _driver;
+deleteVehicle _driver;
+_newDriver moveInDriver _vehicle;
+if (random 10 < 2 && {0 < _vehicle emptyPositions "Cargo"}) then {
+	_class = selectRandom a3e_arr_Escape_MilitaryTraffic_CivilianCrewClasses;
+	_group createUnit [_class, _pos, [] , 0, "CARGO"];
+};
+_vehiclesCrew = crew _vehicle;
+_group addVehicle _vehicle;
+_group selectLeader commander _vehicle;
+
 [_group] call A3E_fnc_onCivilianGroupSpawn;
 
 {[_x] call A3E_fnc_onCivilianSpawn;} foreach units _group;