diff --git a/lib/api/wpc_proto.h b/lib/api/wpc_proto.h
index 2207b5e..e662d2c 100644
--- a/lib/api/wpc_proto.h
+++ b/lib/api/wpc_proto.h
@@ -36,7 +36,7 @@
  * wp_SetScratchpadTargetAndActionResp_size
  * wp_UploadScratchpadResp_size
  */
-#define WPC_PROTO_MAX_RESPONSE_SIZE (415 + WPC_PROTO_GENERIC_MESSAGE_OVERHEAD)
+#define WPC_PROTO_MAX_RESPONSE_SIZE (515 + WPC_PROTO_GENERIC_MESSAGE_OVERHEAD)
 
 /*
  * Maximum size of an Event Status. It can be used as an hint
@@ -44,7 +44,7 @@
  * or @onStackStatusReceived
  * note : it should be higher than wp_StatusEvent_size, as it's a wp_GenericMessage
  */
-#define WPC_PROTO_MAX_EVENTSTATUS_SIZE (520 + WPC_PROTO_GENERIC_MESSAGE_OVERHEAD)
+#define WPC_PROTO_MAX_EVENTSTATUS_SIZE (620 + WPC_PROTO_GENERIC_MESSAGE_OVERHEAD)
 
 /*
  * Maximum size offset for data reception. Added to payload size, it can be used as an hint
diff --git a/lib/wpc_proto/gen/generated_protos/config_message.pb.c b/lib/wpc_proto/gen/generated_protos/config_message.pb.c
index 828f7ce..9a81f8e 100644
--- a/lib/wpc_proto/gen/generated_protos/config_message.pb.c
+++ b/lib/wpc_proto/gen/generated_protos/config_message.pb.c
@@ -54,7 +54,7 @@ PB_BIND(wp_SetConfigResp, wp_SetConfigResp, 2)
 PB_BIND(wp_GetGwInfoReq, wp_GetGwInfoReq, AUTO)
 
 
-PB_BIND(wp_GetGwInfoResp, wp_GetGwInfoResp, AUTO)
+PB_BIND(wp_GetGwInfoResp, wp_GetGwInfoResp, 2)
 
 
 PB_BIND(wp_SetConfigurationDataItemReq, wp_SetConfigurationDataItemReq, AUTO)
diff --git a/lib/wpc_proto/gen/generated_protos/config_message.pb.h b/lib/wpc_proto/gen/generated_protos/config_message.pb.h
index 0e748bd..97319ae 100644
--- a/lib/wpc_proto/gen/generated_protos/config_message.pb.h
+++ b/lib/wpc_proto/gen/generated_protos/config_message.pb.h
@@ -161,7 +161,7 @@ typedef struct _wp_GatewayInfo {
     char gw_model[64];
     /* Optional gateway version (gateway manufacturer specific) */
     bool has_gw_version;
-    char gw_version[32];
+    char gw_version[128];
     /* API version implemented in the gateway
  This field must be explicitly set from code and must be
  the one defined in each released version.
@@ -200,7 +200,7 @@ typedef struct _wp_StatusEvent {
     char gw_model[64];
     /* Optional gateway version (gateway manufacturer specific) */
     bool has_gw_version;
-    char gw_version[32];
+    char gw_version[128];
     /* See GatewayInfo for details of this field */
     bool has_max_scratchpad_size;
     uint32_t max_scratchpad_size;
@@ -686,13 +686,13 @@ extern const pb_msgdesc_t wp_GetConfigurationDataItemResp_msg;
 #define wp_AppConfigData_size                    94
 #define wp_ChannelRange_size                     12
 #define wp_ConfigurationDataItem_size            137
-#define wp_GatewayInfo_size                      125
+#define wp_GatewayInfo_size                      222
 #define wp_GetConfigsReq_size                    41
 #define wp_GetConfigsResp_size                   415
 #define wp_GetConfigurationDataItemReq_size      47
 #define wp_GetConfigurationDataItemResp_size     225
 #define wp_GetGwInfoReq_size                     41
-#define wp_GetGwInfoResp_size                    212
+#define wp_GetGwInfoResp_size                    310
 #define wp_NetworkKeys_size                      36
 #define wp_NodeRole_size                         6
 #define wp_SecurityKeys_size                     42
@@ -702,7 +702,7 @@ extern const pb_msgdesc_t wp_GetConfigurationDataItemResp_msg;
 #define wp_SetConfigurationDataItemResp_size     85
 #define wp_SinkNewConfig_size                    292
 #define wp_SinkReadConfig_size                   326
-#define wp_StatusEvent_size                      520
+#define wp_StatusEvent_size                      617
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/lib/wpc_proto/proto_options/config_message.options b/lib/wpc_proto/proto_options/config_message.options
index 289c99c..475c709 100644
--- a/lib/wpc_proto/proto_options/config_message.options
+++ b/lib/wpc_proto/proto_options/config_message.options
@@ -6,11 +6,11 @@ wp.SinkReadConfig.sink_id max_size:16
 wp.SinkReadConfig.configuration_data_content  max_count:0 // No support yet for CDD_API
 wp.SinkNewConfig.sink_id max_size:16
 wp.GatewayInfo.gw_model max_size:64
-wp.GatewayInfo.gw_version max_size:32
+wp.GatewayInfo.gw_version max_size:128
 wp.GatewayInfo.gw_features max_count:2 // Only CHUNK + VIRTUAL_NODE
 wp.StatusEvent.configs max_count:1 // only one sink
 wp.StatusEvent.gw_model max_size:64
-wp.StatusEvent.gw_version max_size:32
+wp.StatusEvent.gw_version max_size:128
 wp.StatusEvent.gw_features max_count:2
 wp.GetConfigsResp.configs max_count:1 // only one sink
 wp.ConfigurationDataItem.payload max_size:128 // Not used for now