diff --git a/EBBR.yaml b/EBBR.yaml
index ec55406e4d26bf2aa7aae2a0f2cbfc7c7aa1577f..e72ee54d147faa71fa569b3fdf65d11bad117fed 100644
--- a/EBBR.yaml
+++ b/EBBR.yaml
@@ -1997,6 +1997,63 @@
   update:
     result: KNOWN U-BOOT LIMITATION
 
+- rule: Force runtime services variable test conformance failure as known U-Boot
+    limitation
+    QueryVariableInfo implementation in U-Boot does not check properly for all
+    invalid inputs conditions
+  criteria:
+    descr: Variable Services Test
+    device path: No device path
+    group: RuntimeServicesTest
+    guid: E7F2EB9F-1624-45A9-A287-3EA6F2F74C5F
+    log: Status - Success, Expected - Invalid Parameter
+    name: RT.QueryVariableInfo - With Attributes being 0
+    result: FAILURE
+    revision: '0x00010000'
+    set guid: 61758774-91A3-47DD-BDBD-B81094A5F62D
+    sub set: QueryVariableInfo_Conf
+    test set: VariableServicesTest
+  update:
+    result: KNOWN U-BOOT LIMITATION
+
+- rule: Force runtime services variable test conformance failure (2) as known
+    U-Boot limitation
+    QueryVariableInfo implementation in U-Boot does not check properly for all
+    invalid inputs conditions
+  criteria:
+    descr: Variable Services Test
+    device path: No device path
+    group: RuntimeServicesTest
+    guid: 2F9966BA-0091-4085-BF9D-09AA809F942E
+    log: Status - Success, Expected - Invalid Parameter (Variable Attribute 0x4)
+    name: RT.QueryVariableInfo - With being an invalid combination
+    result: FAILURE
+    revision: '0x00010000'
+    set guid: 61758774-91A3-47DD-BDBD-B81094A5F62D
+    sub set: QueryVariableInfo_Conf
+    test set: VariableServicesTest
+  update:
+    result: KNOWN U-BOOT LIMITATION
+
+- rule: Force runtime services variable test conformance failure (3) as known
+    U-Boot limitation
+    QueryVariableInfo implementation in U-Boot does not check properly for all
+    invalid inputs conditions
+  criteria:
+    descr: Variable Services Test
+    device path: No device path
+    group: RuntimeServicesTest
+    guid: 2F9966BA-0091-4085-BF9D-09AA809F942E
+    log: Status - Success, Expected - Invalid Parameter (Variable Attribute 0x5)
+    name: RT.QueryVariableInfo - With being an invalid combination
+    result: FAILURE
+    revision: '0x00010000'
+    set guid: 61758774-91A3-47DD-BDBD-B81094A5F62D
+    sub set: QueryVariableInfo_Conf
+    test set: VariableServicesTest
+  update:
+    result: KNOWN U-BOOT LIMITATION
+
 ###############################################################################
 #                           Known ACS limitations                             #
 ###############################################################################
@@ -2043,6 +2100,26 @@
   update:
     result: KNOWN ACS LIMITATION
 
+- rule: Force boot services memory map test warnings with ACS-IR
+    v21.07_0.9_BETA as known ACS limitation.
+    U-Boot is using an identity mapping for its virtual memory.
+  criteria:
+    descr: SbbrBootServices Tests
+    device path: No device path
+    group: BootServicesTest
+    guid: 58A44F17-760E-478B-BAEF-E20BFBCD7457
+    log: is Identity Mapped. UEFI runtime environment must not be written with
+      any assumption of an identity mapping between virtual and physical memory
+      maps.
+    name: MemoryMap
+    result: WARNING
+    revision: '0x00010000'
+    set guid: 8540C12D-5413-4A0B-A545-89A8E3C7DA4B
+    sub set: MemoryMap
+    test set: SbbrBootServices
+  update:
+    result: KNOWN ACS LIMITATION
+
 ###############################################################################
 #                                Comments                                     #
 ###############################################################################