diff --git a/.github/workflows/mosq__build.yml b/.github/workflows/mosq__build.yml
index 5a05e377b..73cfb2fed 100644
--- a/.github/workflows/mosq__build.yml
+++ b/.github/workflows/mosq__build.yml
@@ -16,12 +16,11 @@ jobs:
         idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3", "release-v5.2", "release-v5.1"]
         example: ["broker", "serverless_mqtt"]
         exclude:
+          # serverless_mqtt is not supported on v5.1 and master (esp-peer dependency)
           - idf_ver: "release-v5.1"
-            example: "serverless_mqtt"  # serverless_mqtt is not supported due to esp-peer
-        include:
+            example: "serverless_mqtt"
           - idf_ver: "latest"
             example: "serverless_mqtt"
-            warning: "'octal_mode' is deprecated"
 
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -35,8 +34,6 @@ jobs:
         with:
           submodules: recursive
       - name: Build with IDF-${{ matrix.idf_ver }}
-        env:
-          EXPECTED_WARNING: ${{ matrix.warning }}
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
diff --git a/components/mosquitto/.cz.yaml b/components/mosquitto/.cz.yaml
index 683a6eb79..03fb62076 100644
--- a/components/mosquitto/.cz.yaml
+++ b/components/mosquitto/.cz.yaml
@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(mosq): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py mosquitto
   tag_format: mosq-v$version
-  version: 2.0.20~3
+  version: 2.0.20~4
   version_files:
   - idf_component.yml
diff --git a/components/mosquitto/CHANGELOG.md b/components/mosquitto/CHANGELOG.md
index a04fd7e05..ba631add9 100644
--- a/components/mosquitto/CHANGELOG.md
+++ b/components/mosquitto/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.0.20~4](https://github.com/espressif/esp-protocols/commits/mosq-v2.0.20_4)
+
+### Features
+
+- Update brokerless example to work with esp-peer ([76e45f72](https://github.com/espressif/esp-protocols/commit/76e45f72))
+
+### Bug Fixes
+
+- drop newlib from PRIV_REQUIRES ([6318022c](https://github.com/espressif/esp-protocols/commit/6318022c))
+- Make esp-peer build optional ([03df9ae9](https://github.com/espressif/esp-protocols/commit/03df9ae9))
+- Fix esp_webRTC deprecation with new FreeRTOS ([78ae2559](https://github.com/espressif/esp-protocols/commit/78ae2559))
+
 ## [2.0.20~3](https://github.com/espressif/esp-protocols/commits/mosq-v2.0.20_3)
 
 
diff --git a/components/mosquitto/idf_component.yml b/components/mosquitto/idf_component.yml
index d58f5b215..f61fdb4e5 100644
--- a/components/mosquitto/idf_component.yml
+++ b/components/mosquitto/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.0.20~3"
+version: "2.0.20~4"
 url: https://github.com/espressif/esp-protocols/tree/master/components/mosquitto
 description: The component provides a simple ESP32 port of mosquitto broker
 dependencies:
diff --git a/components/mosquitto/port/priv_include/config.h b/components/mosquitto/port/priv_include/config.h
index 9a743a68d..73dad3d6b 100644
--- a/components/mosquitto/port/priv_include/config.h
+++ b/components/mosquitto/port/priv_include/config.h
@@ -20,4 +20,4 @@
 #undef  isspace
 #define isspace(__c) (__ctype_lookup((int)__c)&_S)
 
-#define VERSION "v2.0.20~3"
+#define VERSION "v2.0.20~4"