diff --git a/prj.conf b/prj.conf
index b9eed2d..f8557ea 100644
--- a/prj.conf
+++ b/prj.conf
@@ -109,3 +109,6 @@ CONFIG_STREAM_FLASH=y
 # For cpu_temp metric
 CONFIG_SENSOR=y
 CONFIG_ADC=y
+
+# Enable compiler warnings as errors
+CONFIG_COMPILER_WARNINGS_AS_ERRORS=y
diff --git a/west.yml b/west.yml
index 5488704..6817055 100644
--- a/west.yml
+++ b/west.yml
@@ -13,5 +13,4 @@ manifest:
     - name: memfault-firmware-sdk
       url: https://github.com/memfault/memfault-firmware-sdk
       path: modules/lib/memfault-firmware-sdk
-      # Temporarily use a fork with ESP32 support, until 1.26.0 is released
-      revision: noahp/1.25.0+esp32-support
+      revision: 1.26.0