diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
index 5f61661a0..0602061be 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
@@ -98,7 +98,7 @@ private _textures = [
             _vehicle setVariable [QEGVAR(Vehicle,Callsign), -4, true];
         }
     ]],
-    ["I_APC_Wheeled_03_cannon_F", "Toggle Camo Net", [
+    ["cav_dragoon_base_F", "Toggle Camo Net", [
         "",
         {
             private _camoNetMounted = _vehicle animationSourcePhase "showCamonetHull";
@@ -109,7 +109,7 @@ private _textures = [
             };
         }
     ]],
-    ["I_APC_Wheeled_03_cannon_F", "Toggle Slats", [
+    ["cav_dragoon_base_F", "Toggle Slats", [
         "",
         {
             private _slatsAreAttached = _vehicle animationSourcePhase "showSLATHull";
diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
index 9132a2758..047e6329a 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
@@ -66,7 +66,7 @@ if (_vehicle iskindOf "rhsusf_fmtv_base") then {
 };
 
 
-if (_vehicle isKindOf "I_APC_Wheeled_03_cannon_F") then {
+if (_vehicle isKindOf "cav_dragoon_base_F") then {
     // Animate slat armor and camo nets
     _vehicle animateSource ["showCamonetHull",0, true];
     _vehicle animateSource ["showBags",0, true];
diff --git a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf
index 122376224..9c6bdd241 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf
@@ -37,6 +37,8 @@ private _pylon = [];
 
 if (count _pylon == 0) then {
     WARNING_2("VehicleDefaultLoadout", "Vehicle %1 [%2] has no loadout setup.", _vehicle, typeOf _vehicle);
+} else {
+    _vehicle setVariable ["ace_rearm_scriptedLoadout", true, true];
 };
 
 _vehicle setVariable [QEGVAR(VehicleFunc,DefaultPylon), true, true];
\ No newline at end of file
diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf
index ea949362b..23a6af70a 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf
@@ -109,6 +109,6 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
     [_vehicle] call EFUNC(vehicle,addFlagAction);
 };
 
-if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
+if (_vehicle iskindOf "cav_dragoon_base_F") then {
     [_vehicle] call EFUNC(vehicle,addFlagAction);
 };
diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf
index 749e4e66c..4f675ca77 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf
@@ -65,7 +65,7 @@ if (_vehicle iskindOf "Truck_01_base_F") then {
     };
 };
 
-if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
+if (_vehicle iskindOf "cav_dragoon_base_F") then {
     switch (_vehicleType) do {
         case "MED": {_vehicle setVariable ["ace_medical_isMedicalVehicle", true, true];};
         default {};
diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
index 446858f7a..6256d98e2 100644
--- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
@@ -41,7 +41,7 @@ if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(addCargo); };
 
 
 // Ground Vehicles
-if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
+if (_vehicle iskindOf "cav_dragoon_base_F") then {
     [_vehicle, 15, 38, false, false] call FUNC(setCargoAttributes);
     
     // Emergency kit in case of tire damage and fuel loss.
diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
index 84a64f535..85fcfc976 100644
--- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
@@ -117,52 +117,56 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [
 ];
 
 // I_APC_Wheeled_03_cannon_F
-private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [
-    // ["antiarmor", [
+private _cav_dragoon_base_F = createHashMapFromArray [
+    ["antiarmor", [
+        ["SmokeLauncherMag",[0],6],
+        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
+    ]],
+    // ["antiair", [
     //     ["SmokeLauncherMag",[0,0],6],
     //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
     //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-    //     ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-    //     ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-    //     ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-    //     ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-        
+    //     ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+    //     ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+    //     ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+    //     ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+    //     ["4Rnd_Titan_long_missiles",[0],4]
     // ]],
-    [ "antiair", [
-        ["SmokeLauncherMag",[0,0],6],
+    ["default",[
+        ["SmokeLauncherMag",[0],6],
         ["2000Rnd_762x51_Belt_T_Red",[0],2000],
         ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-        ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-        ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-        ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-        ["4Rnd_Titan_long_missiles",[0],4]
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
     ]],
-    ["default",[
-        ["SmokeLauncherMag",[0,0],6],
+    ["balanced",[
+        ["SmokeLauncherMag",[0],6],
         ["2000Rnd_762x51_Belt_T_Red",[0],2000],
         ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-        ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-        ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-        ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-        ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-        ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-        ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
+        ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
     ]]
-    // ["assault",[
-    //     ["SmokeLauncherMag",[0,0],6],
-    //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-    //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-    //     ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-    //     ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
-    //     ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
-    //     ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
-    // ]]
 ];
 
 // Loadout vehicle list
 private _allVehiclePylons = createHashMapFromArray [
     ["rhsusf_m1a1tank_base", _rhsusf_m1a1tank_base],
-    ["I_APC_Wheeled_03_cannon_F", _I_APC_Wheeled_03_cannon_F]
+    ["cav_dragoon_base_F", _cav_dragoon_base_F]
 ];
 
 // Return keys or full hashmap
diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf
index ad271d0bf..aea3a5ee1 100644
--- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf
+++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf
@@ -33,13 +33,13 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
 };
 
 
-if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then {
+if (_vehicle iskindOf "cav_dragoon_base_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then {
     _pylonList = [
         // TypeOf,                     DisplayName,  Name,           Icon
-        // ["I_APC_Wheeled_03_cannon_F", "Anti-Armor",  "antiarmor",    ""],
-        ["I_APC_Wheeled_03_cannon_F", "Anti-Air",    "antiair",      ""],
-        // ["I_APC_Wheeled_03_cannon_F", "Assault",     "assault",      ""],
-        ["I_APC_Wheeled_03_cannon_F", "Default",     "default",      ""]
+        ["cav_dragoon_base_F", "Anti-Personnel (default)",     "default",      ""],
+        ["cav_dragoon_base_F", "Balanced",  "balanced",    ""],
+        ["cav_dragoon_base_F", "Anti-Armor",     "antiarmor",      ""]
+        // ["I_APC_Wheeled_03_cannon_F", "Anti-Air",    "antiair",      ""]
     ];
 };