diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index c3fe631..57b67c6 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -1,6 +1,11 @@
 name: Github Actions Build
 
-on: [push]
+on:
+  push:
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
 
 env:
   COMMS_TAG: v5.2.7
diff --git a/client/lib/include/cc_mqttsn_client/common.h b/client/lib/include/cc_mqttsn_client/common.h
index 4d353ef..158140b 100644
--- a/client/lib/include/cc_mqttsn_client/common.h
+++ b/client/lib/include/cc_mqttsn_client/common.h
@@ -26,7 +26,7 @@ extern "C" {
 
 /// @brief Patch level of the library
 /// @ingroup global
-#define CC_MQTTSN_CLIENT_PATCH_VERSION 4U
+#define CC_MQTTSN_CLIENT_PATCH_VERSION 5U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_MQTTSN_CLIENT_MAKE_VERSION(major_, minor_, patch_) \
diff --git a/gateway/app/gateway/GatewayApp.cpp b/gateway/app/gateway/GatewayApp.cpp
index 1b7ba8b..debb43e 100644
--- a/gateway/app/gateway/GatewayApp.cpp
+++ b/gateway/app/gateway/GatewayApp.cpp
@@ -107,13 +107,7 @@ bool GatewayApp::start(int argc, const char* argv[])
                         return;
                     }
 
-                    boost::asio::post(
-                        m_io,
-                        [this, iter]()
-                        {
-                            m_sessions.erase(iter);
-                        });
-
+                    m_sessions.erase(iter);
                 });
 
             if (!session->start()) {
diff --git a/gateway/lib/include/cc_mqttsn_gateway/version.h b/gateway/lib/include/cc_mqttsn_gateway/version.h
index 56fc283..cc10cb5 100644
--- a/gateway/lib/include/cc_mqttsn_gateway/version.h
+++ b/gateway/lib/include/cc_mqttsn_gateway/version.h
@@ -17,7 +17,7 @@
 #define CC_MQTTSN_GW_MINOR_VERSION 0U
 
 /// @brief Patch level of the library
-#define CC_MQTTSN_GW_PATCH_VERSION 4U
+#define CC_MQTTSN_GW_PATCH_VERSION 5U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_MQTTSN_GW_MAKE_VERSION(major_, minor_, patch_) \