diff --git a/repos/base-hw/src/core/spec/arm/cpu_support.h b/repos/base-hw/src/core/spec/arm/cpu_support.h
index 3fa86f1a07..4654daf93e 100644
--- a/repos/base-hw/src/core/spec/arm/cpu_support.h
+++ b/repos/base-hw/src/core/spec/arm/cpu_support.h
@@ -47,7 +47,7 @@ struct Genode::Arm_cpu : public Hw::Arm_cpu
 		uint64_t d0_d31[32];  /* VFP/SIMD - general purpose registers   */
 	};
 
-	struct alignas(4) Context : Cpu_state, Fpu_context
+	struct alignas(8) Context : Cpu_state, Fpu_context
 	{
 		Context(bool privileged);
 	};
diff --git a/repos/base-hw/src/core/spec/arm_v8/cpu.h b/repos/base-hw/src/core/spec/arm_v8/cpu.h
index 502d9ca62a..29fa1f547a 100644
--- a/repos/base-hw/src/core/spec/arm_v8/cpu.h
+++ b/repos/base-hw/src/core/spec/arm_v8/cpu.h
@@ -71,7 +71,7 @@ struct Genode::Cpu : Hw::Arm_64_cpu
 		Genode::uint64_t  fpcr;
 	};
 
-	struct alignas(8) Context : Cpu_state
+	struct alignas(16) Context : Cpu_state
 	{
 		Genode::uint64_t pstate { };
 		Genode::uint64_t exception_type { RESET };