diff --git a/script/graphs/categorize-tests.plot b/script/graphs/categorize-tests.plot
index 05fe5b2..9286872 100644
--- a/script/graphs/categorize-tests.plot
+++ b/script/graphs/categorize-tests.plot
@@ -1,15 +1,21 @@
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
-set terminal png enhanced font ",18" size 1920, 1080
+
+set title "Incremental Tests Enabled at Each CI Level".subtitle
+set terminal png enhanced font ",16" size 1920, 1080
+
+set datafile separator tab
+set key autotitle columnheader
+
 set style data histograms
 set style histogram rowstacked
+set style fill solid border -1
+
 set boxwidth 0.5 relative
-set style fill solid 1.0 border -1
-set title "Incremental Tests Enabled at each CI level for ".subtitle
-plot ARG1 using 2:xtic(1) title "Build-only",\
-	  '' using 3 title "Static (MISRA, etc.)",\
-	  '' using 4 title "Component",\
-	  '' using 5 title "Integration (boot Linux, etc.)"
+
+stats ARG1 matrix rowheader columnheader nooutput
+
+plot ARG1 using 2:xtic(1), for [i=3:(STATS_columns + 1)] "" using i