diff --git a/src/drivers/dshot/esc/AM32Settings.cpp b/src/drivers/dshot/esc/AM32Settings.cpp
index 7965e78d96..0c3f3a4f90 100644
--- a/src/drivers/dshot/esc/AM32Settings.cpp
+++ b/src/drivers/dshot/esc/AM32Settings.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2025 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2026 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,8 +35,7 @@
 #include "../DShotCommon.h"
 #include <px4_platform_common/log.h>
 
-static constexpr int EEPROM_SIZE = 48;  // AM32 sends raw eeprom data
-static constexpr int RESPONSE_SIZE = 49; // 48B data + 1B CRC
+static constexpr int RESPONSE_SIZE = EEPROM_SIZE + 1; // 48B data + 1B CRC
 
 uORB::Publication<esc_eeprom_read_s> AM32Settings::_esc_eeprom_read_pub{ORB_ID(esc_eeprom_read)};
 
diff --git a/src/drivers/dshot/esc/AM32Settings.h b/src/drivers/dshot/esc/AM32Settings.h
index fadc35fd0c..1f4de9337c 100644
--- a/src/drivers/dshot/esc/AM32Settings.h
+++ b/src/drivers/dshot/esc/AM32Settings.h
@@ -37,59 +37,13 @@
 #include <uORB/Publication.hpp>
 #include <uORB/topics/esc_eeprom_read.h>
 
+static constexpr int EEPROM_SIZE = 48;
+
 class AM32Settings : public ESCSettingsInterface
 {
 public:
 	AM32Settings(int index);
 
-	struct EEPROMData {
-		uint8_t eeprom_start;           // 0: must be 1
-		uint8_t eeprom_version;         // 1: version 0-255
-		uint8_t bootloader_version;     // 2: bootloader version 0-255
-		uint8_t firmware_major;         // 3: firmware version major
-		uint8_t firmware_minor;         // 4: firmware version minor
-		uint8_t max_ramp_speed;         // 5: value/10 percent per ms (default 160 = 16%/ms)
-		uint8_t min_duty_cycle;         // 6: value/2 (default 4 = 2%)
-		uint8_t stick_calibration;      // 7: disable stick calibration (default 0)
-		uint8_t voltage_cutoff;         // 8: absolute voltage cutoff (default 10)
-		uint8_t current_pid_p;          // 9: P value x2 (default 100 = 200)
-		uint8_t current_pid_i;          // 10: I value (default 0)
-		uint8_t current_pid_d;          // 11: D value x10 (default 50 = 500)
-		uint8_t active_brake_power;     // 12: active brake power
-		uint8_t reserved[4];            // 13-16: reserved bytes
-		uint8_t direction_reversed;     // 17: direction reversed
-		uint8_t bidirectional_mode;     // 18: bidirectional mode (1=on, 0=off)
-		uint8_t sinusoidal_startup;     // 19: sinusoidal startup
-		uint8_t complementary_pwm;      // 20: complementary PWM
-		uint8_t variable_pwm_freq;      // 21: variable PWM frequency
-		uint8_t stuck_rotor_protection; // 22: stuck rotor protection
-		uint8_t timing_advance;         // 23: timing advance x0.9375 (16 = 15 degrees)
-		uint8_t pwm_frequency;          // 24: PWM freq in kHz (default 24)
-		uint8_t startup_power;          // 25: startup power 50-150% (default 100)
-		uint8_t motor_kv;               // 26: KV in increments of 40 (55 = 2200kv)
-		uint8_t motor_poles;            // 27: motor poles (default 14)
-		uint8_t brake_on_stop;          // 28: brake on stop (default 0)
-		uint8_t anti_stall;             // 29: anti-stall protection
-		uint8_t beep_volume;            // 30: beep volume 0-11 (default 5)
-		uint8_t telemetry_30ms;         // 31: 30ms telemetry output (0 or 1)
-		uint8_t servo_low;              // 32: servo low (value*2)+750us
-		uint8_t servo_high;             // 33: servo high (value*2)+1750us
-		uint8_t servo_neutral;          // 34: servo neutral 1374+value us (128=1500us)
-		uint8_t servo_deadband;         // 35: servo deadband 0-100
-		uint8_t low_voltage_cutoff;     // 36: low voltage cutoff
-		uint8_t low_voltage_threshold;  // 37: threshold value+250/10V (50=3.0V)
-		uint8_t rc_car_reversing;       // 38: RC car type reversing (default 0)
-		uint8_t hall_sensors;           // 39: hall sensor options
-		uint8_t sine_mode_range;        // 40: sine mode range 5-25% (default 15)
-		uint8_t drag_brake_strength;    // 41: drag brake 1-10 (default 10)
-		uint8_t running_brake_amount;   // 42: brake when running (default 10)
-		uint8_t temperature_limit;      // 43: temp limit 70-140C (141=disabled)
-		uint8_t current_protection;     // 44: current limit value x2 (102=disabled)
-		uint8_t sine_mode_strength;     // 45: sine mode strength 1-10 (default 6)
-		uint8_t input_type;             // 46: input type selector
-		uint8_t auto_timing;            // 47: auto timing
-	} __attribute__((packed));
-
 	int getExpectedResponseSize() override;
 	bool decodeInfoResponse(const uint8_t *buf, int size) override;
 
@@ -97,7 +51,7 @@ public:
 
 private:
 	int _esc_index{};
-	EEPROMData _eeprom_data{};
+	uint8_t _eeprom_data[EEPROM_SIZE] {};
 
 	static uORB::Publication<esc_eeprom_read_s> _esc_eeprom_read_pub;
 };