diff --git a/plugins/out_azure_kusto/azure_kusto.c b/plugins/out_azure_kusto/azure_kusto.c
index 01b679a2f03..dfa083bc10f 100644
--- a/plugins/out_azure_kusto/azure_kusto.c
+++ b/plugins/out_azure_kusto/azure_kusto.c
@@ -135,7 +135,6 @@ flb_sds_t execute_ingest_csl_command(struct flb_azure_kusto *ctx, const char *cs
     flb_plg_debug(ctx->ins, "load_time: %lu", ctx->resources->load_time);
 
     ctx->u->base.net.connect_timeout = ctx->ingestion_endpoint_connect_timeout ;
-    ctx->u->base.net.keepalive_max_recycle = ctx->keep_alive_max_connection_recycle;
 
     /* Get upstream connection */
     u_conn = flb_upstream_conn_get(ctx->u);
@@ -164,6 +163,9 @@ flb_sds_t execute_ingest_csl_command(struct flb_azure_kusto *ctx, const char *cs
                     flb_http_add_header(c, "Accept", 6, "application/json", 16);
                     flb_http_add_header(c, "Authorization", 13, token,
                                         flb_sds_len(token));
+                    flb_http_add_header(c, "x-ms-client-version", 19, "Kusto.Fluent-Bit:1.0.0", 22);
+                    flb_http_add_header(c, "x-ms-app", 8, "Kusto.Fluent-Bit", 16);
+                    flb_http_add_header(c, "x-ms-user", 9, "Kusto.Fluent-Bit", 16);
                     flb_http_buffer_size(c, FLB_HTTP_DATA_SIZE_MAX * 10);
 
                     /* Send HTTP request */
@@ -489,9 +491,6 @@ static struct flb_config_map config_map[] = {
     {FLB_CONFIG_MAP_TIME, "ingestion_endpoint_connect_timeout", FLB_AZURE_KUSTO_INGEST_ENDPOINT_CONNECTION_TIMEOUT, 0, FLB_TRUE,
 	         offsetof(struct flb_azure_kusto, ingestion_endpoint_connect_timeout),
 		              "Set the ingestion endpoint connection timeout in seconds"},
-    {FLB_CONFIG_MAP_INT, "keep_alive_max_connection_recycle", FLB_AZURE_KUSTO_KEEP_ALIVE_MAX_RECYCLE, 0, FLB_TRUE,
-	                offsetof(struct flb_azure_kusto, keep_alive_max_connection_recycle),
-			"Set the max connection recycle value of keep alive connections"},
     /* EOF */
     {0}};
 
diff --git a/plugins/out_azure_kusto/azure_kusto.h b/plugins/out_azure_kusto/azure_kusto.h
index 0722c87a6cf..c97e21f863f 100644
--- a/plugins/out_azure_kusto/azure_kusto.h
+++ b/plugins/out_azure_kusto/azure_kusto.h
@@ -49,10 +49,9 @@
 #define AZURE_KUSTO_RESOURCE_UPSTREAM_URI "uri"
 #define AZURE_KUSTO_RESOURCE_UPSTREAM_SAS "sas"
 
-#define FLB_AZURE_KUSTO_RESOURCES_LOAD_INTERVAL_SEC 3600
+#define FLB_AZURE_KUSTO_RESOURCES_LOAD_INTERVAL_SEC 7200
 
 #define FLB_AZURE_KUSTO_INGEST_ENDPOINT_CONNECTION_TIMEOUT "60"
-#define FLB_AZURE_KUSTO_KEEP_ALIVE_MAX_RECYCLE "20"
 
 
 struct flb_azure_kusto_resources {
@@ -75,7 +74,6 @@ struct flb_azure_kusto {
     flb_sds_t ingestion_mapping_reference;
 
     int ingestion_endpoint_connect_timeout;
-    int keep_alive_max_connection_recycle;
 
     /* records configuration */
     flb_sds_t log_key;
diff --git a/plugins/out_azure_kusto/azure_kusto_conf.c b/plugins/out_azure_kusto/azure_kusto_conf.c
index e932ec659e7..5e10bd9c6a6 100644
--- a/plugins/out_azure_kusto/azure_kusto_conf.c
+++ b/plugins/out_azure_kusto/azure_kusto_conf.c
@@ -160,8 +160,8 @@ static int parse_storage_resources(struct flb_azure_kusto *ctx, struct flb_confi
 {
     jsmn_parser parser;
     jsmntok_t *t;
-    jsmntok_t *tokens;
-    int tok_size = 100;
+    jsmntok_t *tokens = NULL;
+    //int tok_size = 100;
     int ret = -1;
     int i;
     int blob_count = 0;
@@ -199,10 +199,14 @@ static int parse_storage_resources(struct flb_azure_kusto *ctx, struct flb_confi
     }
 
     jsmn_init(&parser);
-    tokens = flb_calloc(1, sizeof(jsmntok_t) * tok_size);
+
+    //tokens = flb_calloc(1, sizeof(jsmntok_t) * tok_size);
+
+    // Dynamically allocate memory for tokens based on response length
+    tokens = flb_calloc(1, sizeof(jsmntok_t) * (flb_sds_len(response)));
 
     if (tokens) {
-        ret = jsmn_parse(&parser, response, flb_sds_len(response), tokens, tok_size);
+        ret = jsmn_parse(&parser, response, flb_sds_len(response), tokens, flb_sds_len(response));
 
         if (ret > 0) {
             /* skip all tokens until we reach "Rows" */
diff --git a/plugins/out_azure_kusto/azure_kusto_ingest.c b/plugins/out_azure_kusto/azure_kusto_ingest.c
index 9e0cccbdadc..05e3cefa4c1 100644
--- a/plugins/out_azure_kusto/azure_kusto_ingest.c
+++ b/plugins/out_azure_kusto/azure_kusto_ingest.c
@@ -152,7 +152,6 @@ static flb_sds_t azure_kusto_create_blob(struct flb_azure_kusto *ctx, flb_sds_t
 
     flb_plg_debug(ctx->ins,"inside blob after upstream ha node get");
     u_node->u->base.net.connect_timeout = ctx->ingestion_endpoint_connect_timeout;
-    u_node->u->base.net.keepalive_max_recycle = ctx->keep_alive_max_connection_recycle;
 
     u_conn = flb_upstream_conn_get(u_node->u);
 
@@ -181,6 +180,10 @@ static flb_sds_t azure_kusto_create_blob(struct flb_azure_kusto *ctx, flb_sds_t
                 flb_http_add_header(c, "x-ms-blob-type", 14, "BlockBlob", 9);
                 flb_http_add_header(c, "x-ms-date", 9, tmp, len);
                 flb_http_add_header(c, "x-ms-version", 12, "2019-12-12", 10);
+                flb_http_add_header(c, "x-ms-client-version", 19, "Kusto.Fluent-Bit:1.0.0", 22);
+                flb_http_add_header(c, "x-ms-app", 8, "Kusto.Fluent-Bit", 16);
+                flb_http_add_header(c, "x-ms-user", 9, "Kusto.Fluent-Bit", 16);
+
 
                 ret = flb_http_do(c, &resp_size);
                 flb_plg_debug(ctx->ins,
@@ -386,7 +389,6 @@ static int azure_kusto_enqueue_ingestion(struct flb_azure_kusto *ctx, flb_sds_t
     }
     
     u_node->u->base.net.connect_timeout = ctx->ingestion_endpoint_connect_timeout;
-    u_node->u->base.net.keepalive_max_recycle = ctx->keep_alive_max_connection_recycle;
 
     u_conn = flb_upstream_conn_get(u_node->u);
 
@@ -415,6 +417,9 @@ static int azure_kusto_enqueue_ingestion(struct flb_azure_kusto *ctx, flb_sds_t
                                         20);
                     flb_http_add_header(c, "x-ms-date", 9, tmp, len);
                     flb_http_add_header(c, "x-ms-version", 12, "2019-12-12", 10);
+                    flb_http_add_header(c, "x-ms-client-version", 19, "Kusto.Fluent-Bit:1.0.0", 22);
+                    flb_http_add_header(c, "x-ms-app", 8, "Kusto.Fluent-Bit", 16);
+                    flb_http_add_header(c, "x-ms-user", 9, "Kusto.Fluent-Bit", 16);
 
                     ret = flb_http_do(c, &resp_size);
                     flb_plg_debug(ctx->ins,