diff --git a/src/ipa/libipa/camera_sensor_helper.cpp b/src/ipa/libipa/camera_sensor_helper.cpp
index 5fbeefaf5e90..d8a9fe63417c 100644
--- a/src/ipa/libipa/camera_sensor_helper.cpp
+++ b/src/ipa/libipa/camera_sensor_helper.cpp
@@ -658,29 +658,18 @@ public:
 };
 REGISTER_CAMERA_SENSOR_HELPER(CameraSensorHelperImx477, "imx477")
 
-class CameraSensorHelperImx662 : public CameraSensorHelper
+class CameraSensorHelperStarvis2: public CameraSensorHelper
 {
 public:
-	CameraSensorHelperImx662()
-	{
-		/* From datasheet: 0xc8 at 12bits. */
-		blackLevel_ = 3200;
-		gain_ = AnalogueGainExp{ 1.0, expGainDb(0.3) };
-	}
-};
-REGISTER_CAMERA_SENSOR_HELPER(CameraSensorHelperImx662, "imx662")
-
-class CameraSensorHelperImx678 : public CameraSensorHelper
-{
-public:
-	CameraSensorHelperImx678()
+	CameraSensorHelperStarvis2()
 	{
 		/* From datasheet: 0x32 at 10bits. */
 		blackLevel_ = 3200;
 		gain_ = AnalogueGainExp{ 1.0, expGainDb(0.3) };
 	}
 };
-REGISTER_CAMERA_SENSOR_HELPER(CameraSensorHelperImx678, "imx678")
+REGISTER_CAMERA_SENSOR_HELPER(CameraSensorHelperStarvis2, "imx585", "imx662",
+			      "imx676", "imx678")
 
 class CameraSensorHelperImx708 : public CameraSensorHelper
 {
diff --git a/src/libcamera/sensor/camera_sensor_properties.cpp b/src/libcamera/sensor/camera_sensor_properties.cpp
index 20cfd0bc11a6..1916e905cb7c 100644
--- a/src/libcamera/sensor/camera_sensor_properties.cpp
+++ b/src/libcamera/sensor/camera_sensor_properties.cpp
@@ -340,6 +340,16 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
 				.hblankDelay = 3
 			},
 		} },
+		{ "imx585", {
+			.unitCellSize = { 2900, 2900 },
+			.testPatternModes = {},
+			.sensorDelays = {
+				.exposureDelay = 2,
+				.gainDelay = 2,
+				.vblankDelay = 2,
+				.hblankDelay = 2
+			},
+		} },
 		{ "imx662", {
 			.unitCellSize = { 2900, 2900 },
 			.testPatternModes = {},
@@ -350,6 +360,16 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
 				.hblankDelay = 2
 			},
 		} },
+		{ "imx676", {
+			.unitCellSize = { 2000, 2000 },
+			.testPatternModes = {},
+			.sensorDelays = {
+				.exposureDelay = 2,
+				.gainDelay = 2,
+				.vblankDelay = 2,
+				.hblankDelay = 2
+			},
+		} },
 		{ "imx678", {
 			.unitCellSize = { 2000, 2000 },
 			.testPatternModes = {},