diff --git a/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/boot.S b/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/boot.S
index 24d5bb031d..f06106608a 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/boot.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/boot.S
@@ -57,7 +57,7 @@ _start:
 	b.ne	start_ns			// skip EL3 initialisation
 
 	mov	x0, #0x30			// RES1
-	orr	x0, x0, #(1 << 0)		// Non-secure EL1
+	orr	x0, x0, #(1 << 0)		// Non-secure bit
 	orr	x0, x0, #(1 << 8)		// HVC enable
 	orr	x0, x0, #(1 << 10)		// 64-bit EL2
 	msr	scr_el3, x0
@@ -88,7 +88,7 @@ _start:
 
 2:	ldr	x1, =GIC_CPU_BASE		// GICC_CTLR
 	ldr	w0, [x1]
-	mov	w0, #3				// EnableGrp0 | EnableGrp1
+	orr	w0, w0, #3			// EnableGrp0 | EnableGrp1
 	str	w0, [x1]
 
 	mov	w0, #1 << 7			// allow NS access to GICC_PMR