diff --git a/packages/website/src/components/Armor/components/StaticArmor.tsx b/packages/website/src/components/Armor/components/StaticArmor.tsx
index 5055cad74..18e41b2da 100644
--- a/packages/website/src/components/Armor/components/StaticArmor.tsx
+++ b/packages/website/src/components/Armor/components/StaticArmor.tsx
@@ -43,7 +43,8 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
   const tankModelDefinition = useTankModelDefinition();
   const trackModelDefinition = tankModelDefinition.tracks[track.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
-  const gunModelDefinition = turretModelDefinition.guns[gun.id];
+  const gunModelDefinition =
+    turretModelDefinition.guns[gun.gunType!.value.base.id];
   const hullOrigin = correctZYTuple(trackModelDefinition.origin);
   const turretOrigin = correctZYTuple(tankModelDefinition.turretOrigin);
   const gunOrigin = correctZYTuple(turretModelDefinition.gunOrigin);
@@ -130,7 +131,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
       <group ref={turretContainer}>
         {armorNodes.map((node) => {
           const isCurrentTurret = node.name.startsWith(
-            `turret_${turretModelDefinition.model.toString().padStart(2, '0')}`,
+            `turret_${turretModelDefinition.modelId.toString().padStart(2, '0')}`,
           );
           const isVisible = isCurrentTurret;
           const armorId = nameToArmorId(node.name);
@@ -176,7 +177,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
             const duel = duelStore.getState();
             const hasImprovedVerticalStabilizer = await hasEquipment(
               122,
-              duel.protagonist.tank.equipment,
+              duel.protagonist.tank.equipmentPreset,
               duel.protagonist.equipmentMatrix,
             );
             const boundingRect = canvas.getBoundingClientRect();
@@ -206,8 +207,8 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
           }
 
           return (
-            <group position={hullOrigin}>
-              <group key={node.uuid} position={turretOrigin}>
+            <group key={node.uuid} position={hullOrigin}>
+              <group position={turretOrigin}>
                 <StaticArmorSceneComponent
                   name={node.name}
                   thicknessRange={thicknessRange}
@@ -225,7 +226,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
         <group ref={gunContainer}>
           {armorNodes.map((node) => {
             const isCurrentGun = node.name.startsWith(
-              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`,
+              `gun_${gunModelDefinition.modelId.toString().padStart(2, '0')}`,
             );
             const isVisible = isCurrentGun;
             const armorId = nameToArmorId(node.name);
@@ -271,7 +272,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
               const duel = duelStore.getState();
               const hasImprovedVerticalStabilizer = await hasEquipment(
                 122,
-                duel.protagonist.tank.equipment,
+                duel.protagonist.tank.equipmentPreset,
                 duel.protagonist.equipmentMatrix,
               );
               const boundingRect = canvas.getBoundingClientRect();
@@ -300,11 +301,8 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
             }
 
             return (
-              <group position={hullOrigin}>
-                <group
-                  key={node.uuid}
-                  position={turretOrigin.clone().add(gunOrigin)}
-                >
+              <group key={node.uuid} position={hullOrigin}>
+                <group position={turretOrigin.clone().add(gunOrigin)}>
                   <StaticArmorSceneComponent
                     name={node.name}
                     thicknessRange={thicknessRange}
@@ -319,7 +317,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
           })}
 
           {modelNodes.map((node) => {
-            const gunString = `gun_${gunModelDefinition.model
+            const gunString = `gun_${gunModelDefinition.modelId
               .toString()
               .padStart(2, '0')}`;
             const isCurrentGun = gunModelDefinition.mask
@@ -356,7 +354,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
               const duel = duelStore.getState();
               const hasImprovedVerticalStabilizer = await hasEquipment(
                 122,
-                duel.protagonist.tank.equipment,
+                duel.protagonist.tank.equipmentPreset,
                 duel.protagonist.equipmentMatrix,
               );
               const boundingRect = canvas.getBoundingClientRect();