diff --git a/trusty/device/arm/generic-arm64 b/trusty/device/arm/generic-arm64
index 882df51..8593e0b 160000
--- a/trusty/device/arm/generic-arm64
+++ b/trusty/device/arm/generic-arm64
@@ -1 +1 @@
-Subproject commit 882df515c6e303609574895a6b632b69e7dc1da8
+Subproject commit 8593e0ba1b1b76247007a2cdb8d2972b5bbd2820
diff --git a/trusty/user/app/keymaster b/trusty/user/app/keymaster
index 6245f3b..dbbf7f4 160000
--- a/trusty/user/app/keymaster
+++ b/trusty/user/app/keymaster
@@ -1 +1 @@
-Subproject commit 6245f3bd40f6d8af965048bc94cb724a17cd590e
+Subproject commit dbbf7f405d2c96b2efaa6d1f2984e12c47dc5992