diff --git a/include/common/asm_macros.S b/include/common/asm_macros.S
index 00c7d88..d4bd11e 100644
--- a/include/common/asm_macros.S
+++ b/include/common/asm_macros.S
@@ -69,20 +69,26 @@
 	/*
 	 * Declare the exception vector table, enforcing it is aligned on a
 	 * 2KB boundary, as required by the ARMv8 architecture.
+	 * Use zero bytes as the fill value to be stored in the padding bytes
+	 * so that it inserts illegal AArch64 instructions. This increases
+	 * security, robustness and potentially facilitates debugging.
 	 */
 	.macro vector_base  label
 	.section .vectors, "ax"
-	.align 11
+	.align 11, 0
 	\label:
 	.endm
 
 	/*
 	 * Create an entry in the exception vector table, enforcing it is
 	 * aligned on a 128-byte boundary, as required by the ARMv8 architecture.
+	 * Use zero bytes as the fill value to be stored in the padding bytes
+	 * so that it inserts illegal AArch64 instructions. This increases
+	 * security, robustness and potentially facilitates debugging.
 	 */
 	.macro vector_entry  label
 	.section .vectors, "ax"
-	.align 7
+	.align 7, 0
 	\label:
 	.endm