diff --git a/cmake/toolchain/aarch64-linux-gnu-custom.cmake b/cmake/toolchain/aarch64-linux-gnu-custom.cmake
index 2c02a76..6345bf1 100644
--- a/cmake/toolchain/aarch64-linux-gnu-custom.cmake
+++ b/cmake/toolchain/aarch64-linux-gnu-custom.cmake
@@ -1,6 +1,5 @@
 #
-# SPDX-FileCopyrightText: Copyright 2020-2022 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
+# SPDX-FileCopyrightText: Copyright 2020-2022, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -26,7 +25,7 @@
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-add_compile_options(-Wall -Wextra)
+add_compile_options(-Wall -Wextra -Werror)
 
 set(CMAKE_FIND_ROOT_PATH /opt/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu/aarch64-linux-gnu/)
 
diff --git a/cmake/toolchain/aarch64-linux-gnu.cmake b/cmake/toolchain/aarch64-linux-gnu.cmake
index 8d95e57..8528f1d 100644
--- a/cmake/toolchain/aarch64-linux-gnu.cmake
+++ b/cmake/toolchain/aarch64-linux-gnu.cmake
@@ -1,6 +1,5 @@
 #
-# SPDX-FileCopyrightText: Copyright 2020-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
+# SPDX-FileCopyrightText: Copyright 2020-2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -24,4 +23,4 @@
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-add_compile_options(-Wall -Wextra)
+add_compile_options(-Wall -Wextra -Werror)
diff --git a/cmake/toolchain/aarch64-none-linux-gnu.cmake b/cmake/toolchain/aarch64-none-linux-gnu.cmake
index 6b216cd..782bbf5 100644
--- a/cmake/toolchain/aarch64-none-linux-gnu.cmake
+++ b/cmake/toolchain/aarch64-none-linux-gnu.cmake
@@ -1,6 +1,5 @@
 #
-# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
+# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -24,4 +23,4 @@
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-add_compile_options(-Wall -Wextra)
+add_compile_options(-Wall -Wextra -Werror)