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};