diff --git a/applications/baremetal/main.cpp b/applications/baremetal/main.cpp
index e9b398a..ab365c6 100644
--- a/applications/baremetal/main.cpp
+++ b/applications/baremetal/main.cpp
@@ -45,13 +45,9 @@
  * InferenceJob
  ****************************************************************************/
 
-#ifndef TENSOR_ARENA_SIZE
-#define TENSOR_ARENA_SIZE 2000000
-#endif
+__attribute__((section(".bss.tensor_arena"), aligned(16))) uint8_t TFLuTensorArena[tensorArenaSize];
 
-__attribute__((section(".bss.tensor_arena"), aligned(16))) uint8_t TFLuTensorArena[TENSOR_ARENA_SIZE];
-
-class InferenceProcess inferenceProcess(TFLuTensorArena, TENSOR_ARENA_SIZE);
+class InferenceProcess inferenceProcess(TFLuTensorArena, tensorArenaSize);
 
 uint8_t outputData[sizeof(expectedOutputData)] __attribute__((aligned(16), section("output_data_sec")));
 
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
index 884dedc..e2221c2 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-128 cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4068,4 +4070,4 @@
     0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c,
     0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00,
-    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
index 5425666..593ece7 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-128 dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10457,4 +10459,4 @@
     0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01,
     0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00,
     0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00,
-    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 14145a0..d2dd957 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-128 ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i output/ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -23977,4 +23979,4 @@
     0x00, 0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64,
     0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00,
     0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-    0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/input.h
index 8afc228..7a66d1a 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_dnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/blob/master/MODEL_LIST.md
+ * Source: https://github.com/ARM-software/ML-zoo/blob/22.02/MODEL_LIST.md
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0xee, 0xf6, 0x10, 0x0f, 0x7e, 0x8a, 0xe3, 0x2b, 0xb7, 0x42, 0xdb, 0x88, 0x97, 0xd4, 0x3f, 0x0c, 0x52, 0x6d, 0x2e,
     0xed, 0x76, 0x37, 0xca, 0xaf, 0xfb, 0x9d, 0xb1, 0x1c, 0x6b, 0xb5, 0x71, 0xee, 0x72, 0xc1, 0xb6, 0x0f, 0x3a, 0xf3,
     0x38, 0x3b, 0xa3, 0x75, 0xbd, 0xf0, 0xf6, 0x86, 0x1a, 0xbc, 0x1c, 0x6a, 0x43, 0xe5, 0xcb, 0x7d, 0xd4, 0xf0, 0x5b,
-    0xbe, 0xb1, 0x69, 0x1f, 0x1b, 0x9c, 0xdf, 0x19, 0xa3, 0x2e, 0xd6, 0x9b, 0xed, 0x90, 0x92};
\ No newline at end of file
+    0xbe, 0xb1, 0x69, 0x1f, 0x1b, 0x9c, 0xdf, 0x19, 0xa3, 0x2e, 0xd6, 0x9b, 0xed, 0x90, 0x92};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
index 90474cf..7474ff1 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_ds_dnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/blob/master/MODEL_LIST.md
+ * Source: https://github.com/ARM-software/ML-zoo/blob/22.02/MODEL_LIST.md
  * Vela optimisation: vela --accelerator-config ethos-u55-128 ds_dnn_clustered.tflite
  * Hexdump: xxd -i ds_dnn_clustered_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 75000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 75000;
 
 const char *modelName = "keyword_spotting_ds_dnn_large_clustered_int8";
 
@@ -23297,4 +23299,4 @@
     0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c,
     0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75,
-    0x00};
\ No newline at end of file
+    0x00};
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/output.h
index 71767da..ab6da60 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_dnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/blob/master/MODEL_LIST.md
+ * Source: https://github.com/ARM-software/ML-zoo/blob/22.02/MODEL_LIST.md
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
index df4480b..82959fe 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-256 cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4068,4 +4070,4 @@
     0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c,
     0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00,
-    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
index a4c7437..d9e6593 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-128 dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10457,4 +10459,4 @@
     0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01,
     0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00,
     0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00,
-    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index df1595b..814e440 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-256 ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -24015,4 +24017,4 @@
     0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00,
-    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
index c0e15d5..bb3c5de 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-32 cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4042,4 +4044,4 @@
     0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74,
-    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
index f190887..24458ec 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-32 dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10435,4 +10437,4 @@
     0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00,
     0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07,
-    0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 851df8d..4d9dc74 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-32 ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -23790,4 +23792,4 @@
     0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65,
     0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00,
     0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
index bd0c32d..b6e5cd7 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-64 cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4068,4 +4070,4 @@
     0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c,
     0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00,
-    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
index 4c3068b..19317f4 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-64 dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10458,4 +10460,4 @@
     0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74,
-    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 46f49eb..cbec876 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-64 ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -23881,4 +23883,4 @@
     0x00, 0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64,
     0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00,
     0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-    0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
index fb8950b..eb3ff23 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4063,4 +4065,4 @@
     0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00,
     0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00,
     0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65,
-    0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
index e8e51bb..95d8d09 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10457,4 +10459,4 @@
     0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01,
     0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00,
     0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00,
-    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 3d49e8d..f1bfb74 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -23871,4 +23873,4 @@
     0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00,
-    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
index 5b4e64d..a771f6e 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-512 --memory-mode Shared_Sram cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4076,4 +4078,4 @@
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d,
     0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f,
     0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
index 13a5a8c..7a15d83 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-512 --memory-mode Shared_Sram dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10465,4 +10467,4 @@
     0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c,
     0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75,
-    0x00};
\ No newline at end of file
+    0x00};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index f795f32..1630ee4 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-512 --memory-mode Shared_Sram ds_cnn_clustered.tflite
  * Hexdump: xxd -i ds_cnn_clustered_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -24099,4 +24101,4 @@
     0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73,
     0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04,
     0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
diff --git a/scripts/run_platform.py b/scripts/run_platform.py
index a39de8b..0629fef 100755
--- a/scripts/run_platform.py
+++ b/scripts/run_platform.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -48,7 +48,7 @@
             if (index > 1):
                 raise Exception("Illegal index value - Should be '0' or '1'")
             (ta_parsed)[index] = value
-    
+
     return ta_parsed
 
 def build_core_platform(output_folder, target, toolchain, memory_model, memory_arena, pmu,
@@ -183,7 +183,12 @@
     res = run_cmd(vela_cmd)
     optimized_model_path = output_folder/(network_path.stem + "_vela.tflite")
     model_name = network_path.stem
-    dump_c_header(optimized_model_path, output_folder/"model.h", "networkModelData", "network_model_sec", 16, extra_data=f"const char *modelName=\"{model_name}\";\n")
+    dump_c_header(optimized_model_path, output_folder/"model.h", "networkModelData", "network_model_sec", 16, extra_data=f"""
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000000;
+const char* modelName = \"{model_name}\";
+""")
 
 def run_model(output_folder):
     build_folder = output_folder/"model"/"build"