diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
index 6fafce3f42..054ea28b83 100644
--- a/docs/doxygen/config.doxyfile
+++ b/docs/doxygen/config.doxyfile
@@ -2337,7 +2337,7 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = libraries/standard/coreMQTT/docs/doxygen/output/mqtt.tag=../../../../libraries/standard/coreMQTT/docs/doxygen/output/html \
+TAGFILES               = libraries/standard/coreMQTT/docs/doxygen/output/html/mqtt.tag=../../../../libraries/standard/coreMQTT/docs/doxygen/output/html \
                          libraries/standard/coreJSON/docs/doxygen/output/json.tag=../../../../libraries/standard/coreJSON/docs/doxygen/output/html \
                          libraries/standard/corePKCS11/docs/doxygen/output/core_pkcs11.tag=../../../../libraries/standard/corePKCS11/docs/doxygen/output/html \
                          libraries/aws/device-shadow-for-aws-iot-embedded-sdk/docs/doxygen/output/shadow.tag=../../../../libraries/aws/device-shadow-for-aws-iot-embedded-sdk/docs/doxygen/output/html \
diff --git a/libraries/standard/coreMQTT b/libraries/standard/coreMQTT
index 2beef04725..86a5750bb3 160000
--- a/libraries/standard/coreMQTT
+++ b/libraries/standard/coreMQTT
@@ -1 +1 @@
-Subproject commit 2beef04725328923e05e576b884212d53ec97af7
+Subproject commit 86a5750bb31e05fa69ef3f4e2f5e69d9317fae44
diff --git a/manifest.yml b/manifest.yml
index 6d81b2a482..67da4021b7 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -8,7 +8,7 @@ description: |-
   See dependencies for included libraries."
 dependencies:
   - name: "coreMQTT"
-    version: "v2.3.1"
+    version: "86a5750bb31e05fa69ef3f4e2f5e69d9317fae44"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/coreMQTT"