diff --git a/boards.txt b/boards.txt
index b8110d6eeb5..e0fb66b2e8c 100644
--- a/boards.txt
+++ b/boards.txt
@@ -19365,7 +19365,7 @@ m5stack_unit_cams3.build.partitions=default
 m5stack_unit_cams3.build.defines=
 m5stack_unit_cams3.build.loop_core=
 m5stack_unit_cams3.build.event_core=
-m5stack_unit_cams3.build.psram_type=qspi
+m5stack_unit_cams3.build.psram_type=opi
 m5stack_unit_cams3.build.memory_type={build.boot}_{build.psram_type}
 
 ## IDE 2.0 Seems to not update the value
@@ -19381,15 +19381,12 @@ m5stack_unit_cams3.menu.JTAGAdapter.bridge=ESP USB Bridge
 m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
 m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
 
-m5stack_unit_cams3.menu.PSRAM.enabled=QSPI PSRAM
-m5stack_unit_cams3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-m5stack_unit_cams3.menu.PSRAM.enabled.build.psram_type=qspi
-m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
-m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
-m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi
 m5stack_unit_cams3.menu.PSRAM.opi=OPI PSRAM
 m5stack_unit_cams3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 m5stack_unit_cams3.menu.PSRAM.opi.build.psram_type=opi
+m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
+m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
+m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi
 
 m5stack_unit_cams3.menu.FlashMode.qio=QIO 80MHz
 m5stack_unit_cams3.menu.FlashMode.qio.build.flash_mode=dio
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
index 54e2df8f38c..5c544c934bf 100644
--- a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
@@ -21,6 +21,7 @@
 //#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_ESP32CAM // No PSRAM
 //#define CAMERA_MODEL_M5STACK_UNITCAM // No PSRAM
+//#define CAMERA_MODEL_M5STACK_CAMS3_UNIT  // Has PSRAM
 //#define CAMERA_MODEL_AI_THINKER // Has PSRAM
 //#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
 //#define CAMERA_MODEL_XIAO_ESP32S3 // Has PSRAM
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
index 450ef6a93ff..34085086769 100644
--- a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
@@ -136,6 +136,27 @@
 #define HREF_GPIO_NUM  26
 #define PCLK_GPIO_NUM  21
 
+#elif defined(CAMERA_MODEL_M5STACK_CAMS3_UNIT)
+#define PWDN_GPIO_NUM  -1
+#define RESET_GPIO_NUM 21
+#define XCLK_GPIO_NUM  11
+#define SIOD_GPIO_NUM  17
+#define SIOC_GPIO_NUM  41
+
+#define Y9_GPIO_NUM    13
+#define Y8_GPIO_NUM    4
+#define Y7_GPIO_NUM    10
+#define Y6_GPIO_NUM    5
+#define Y5_GPIO_NUM    7
+#define Y4_GPIO_NUM    16
+#define Y3_GPIO_NUM    15
+#define Y2_GPIO_NUM    6
+#define VSYNC_GPIO_NUM 42
+#define HREF_GPIO_NUM  18
+#define PCLK_GPIO_NUM  12
+
+#define LED_GPIO_NUM 14
+
 #elif defined(CAMERA_MODEL_AI_THINKER)
 #define PWDN_GPIO_NUM  32
 #define RESET_GPIO_NUM -1