diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h
index 5031eeb30d..f490bb01a2 100644
--- a/firmware/include/gbb_header.h
+++ b/firmware/include/gbb_header.h
@@ -53,7 +53,8 @@
 #define GBB_FLAG_ENTER_TRIGGERS_TONORM    0x00000040
 /* Allow booting Legacy OSes in dev mode even if dev_boot_legacy=0. */
 #define GBB_FLAG_FORCE_DEV_BOOT_LEGACY    0x00000080
-
+/* Allow booting using alternate keys for FAFT servo testing */
+#define GBB_FLAG_FAFT_KEY_OVERIDE         0x00000100
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/scripts/image_signing/set_gbb_flags.sh b/scripts/image_signing/set_gbb_flags.sh
index de17c83dd5..ac52432df2 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -30,6 +30,7 @@ GBBFLAGS_DESCRIPTION="
   GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK  0x00000020
   GBB_FLAG_ENTER_TRIGGERS_TONORM      0x00000040
   GBB_FLAG_FORCE_DEV_BOOT_LEGACY      0x00000080
+  GBB_FLAG_FAFT_KEY_OVERIDE           0x00000100
 
   To get a developer-friendly device, try 0x11 (short_delay + boot_usb).
   For factory-related tests (always DEV), try 0x39.