diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 3edf69e6a3b739..bb969229639005 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -2735,6 +2735,46 @@ PICS:
     - label: "Does the DUT(server) support the ExpiringUserTimeOut attribute?"
       id: DRLK.S.A0035
 
+    - label:
+          "Does the DUT(server) support the AliroReaderVerificationKey attribute"
+      id: DRLK.S.A0080
+
+    - label:
+          "Does the DUT(server) support the AliroReaderGroupIdentifier attribute"
+      id: DRLK.S.A0081
+
+    - label:
+          "Does the DUT(server) support the AliroReaderGroupSubIdentifier
+          attribute"
+      id: DRLK.S.A0082
+
+    - label:
+          "Does the DUT(server) support the
+          AliroExpeditedTransactionSupportedProtocolVersions attribute"
+      id: DRLK.S.A0083
+
+    - label: "Does the DUT(server) support the AliroGroupResolvingKey attribute"
+      id: DRLK.S.A0084
+
+    - label:
+          "Does the DUT(server) support the AliroSupportedBLEUWBProtocolVersions
+          attribute"
+      id: DRLK.S.A0085
+
+    - label:
+          "Does the DUT(server) support the AliroBLEAdvertisingVersion attribute"
+      id: DRLK.S.A0086
+
+    - label:
+          "Does the DUT(server) support the
+          NumberOfAliroCredentialIssuerKeysSupported attribute"
+      id: DRLK.S.A0087
+
+    - label:
+          "Does the DUT(server) support the NumberOfAliroEndpointKeysSupported
+          attribute"
+      id: DRLK.S.A0088
+
     #
     #Server ReadOnly attribute
     #
@@ -2866,6 +2906,12 @@ PICS:
     - label: "Does the DUT(server) support the Unbolt Door command?"
       id: DRLK.S.C27.Rsp
 
+    - label: "Does the DUT(server) support the SetAliroReaderConfig command?"
+      id: DRLK.S.C28.Rsp
+
+    - label: "Does the DUT(server) support the ClearAliroReaderConfig command?"
+      id: DRLK.S.C29.Rsp
+
     #
     # server / commandsGenerated
     #
@@ -2967,6 +3013,14 @@ PICS:
     - label: "Does the DUT(server) support the Lock supports unbolting feature?"
       id: DRLK.S.F0c
 
+    - label: "Does the DUT(server) support AliroProvisioning feature?"
+      id: DRLK.S.F0d
+
+    - label:
+          "Does the DUT(server) support Bluetooth LE + UWB Access Control Flow
+          feature?"
+      id: DRLK.S.F0e
+
     #
     # server / manually
     #
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
index e84b1ebdbc8459..8bce2046d74897 100755
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
@@ -1551,8 +1551,18 @@ tests:
       response:
           value: NumberOfCredentialsSupportedPerUserValue
 
-    - label: "Cleanup the created user"
-      PICS: DRLK.S.F00 && DRLK.S.F07
+    - label: "Step 36: TH sends ClearCredential Command to DUT"
+      PICS: DRLK.S.F00 && DRLK.S.F07 && DRLK.S.C26.Rsp
+      command: "ClearCredential"
+      timedInteractionTimeoutMs: 1000
+      arguments:
+          values:
+              - name: "Credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+
+    - label:
+          "Step 37: TH sends ClearUser Command to DUT with the UserIndex as 1"
+      PICS: DRLK.S.F07 && DRLK.S.C1d.Rsp
       command: "ClearUser"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -1560,11 +1570,269 @@ tests:
               - name: "UserIndex"
                 value: 1
 
-    - label: "Clean the created credential"
-      PICS: DRLK.S.F00 && DRLK.S.F07 && DRLK.S.C26.Rsp
-      command: "ClearCredential"
-      timedInteractionTimeoutMs: 1000
+    - label: "Step 38a: TH reads AliroReaderVerificationKey attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0080
+      command: "readAttribute"
+      attribute: "AliroReaderVerificationKey"
+      response:
+          saveAs: verificationkey
+          constraints:
+              type: octet_string
+              minLength: 65
+
+    - label:
+          "Step 38b: TH writes AliroReaderVerificationKey attribute as an octstr
+          value of length 65 which is different from verificationkey"
+      PICS: DRLK.S.F0d && DRLK.S.A0080
+      command: "writeAttribute"
+      attribute: "AliroReaderVerificationKey"
       arguments:
-          values:
-              - name: "Credential"
-                value: { CredentialType: 1, CredentialIndex: 1 }
+          value: "047a4c992d753924cdf3779a3c84fec2debaa6f0b3084450878acc7ddcce7856ae57b1ebbe2561015103dd7474c2a183675378ec55f1e465ac3436bf3dd5ca54d4"
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 38c: TH reads AliroReaderVerificationKey attribute from DUT"
+
+      PICS: DRLK.S.F0d && DRLK.S.A0080
+      command: "readAttribute"
+      attribute: "AliroReaderVerificationKey"
+      response:
+          value: verificationkey
+
+    - label: "Step 39a: TH reads AliroReaderGroupIdentifier attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0081
+      command: "readAttribute"
+      attribute: "AliroReaderGroupIdentifier"
+      response:
+          saveAs: aliroreadergrpidentifier
+          constraints:
+              type: octet_string
+              minLength: 16
+    - label:
+          "Step 39b: TH writes AliroReaderGroupIdentifier attribute as octstr
+          value of length 16 which is different from aliroreadergrpidentifier"
+      PICS: DRLK.S.F0d && DRLK.S.A0081
+      command: "writeAttribute"
+      attribute: "AliroReaderVerificationKey"
+      arguments:
+          value: "047a4c992d753924"
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 39c: TH reads AliroReaderGroupIdentifier attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0081
+      command: "readAttribute"
+      attribute: "AliroReaderGroupIdentifier"
+      response:
+          value: aliroreadergrpidentifier
+    - label:
+          "Step 40a: TH reads AliroReaderGroupSubIdentifier attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0082
+      command: "readAttribute"
+      attribute: "AliroReaderGroupSubIdentifier"
+      response:
+          saveAs: aliroreadergrpsubidentifier
+          constraints:
+              type: octet_string
+              minLength: 16
+
+    - label:
+          "Step 40b: TH writes AliroReaderGroupSubIdentifier attribute as octstr
+          value of length 16 which is different from aliroreadergrpsubidentifier"
+      PICS: DRLK.S.F0d && DRLK.S.A0082
+      command: "writeAttribute"
+      attribute: "AliroReaderGroupSubIdentifier"
+      arguments:
+          value: "047a4c992d75368"
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 40c: TH reads AliroReaderGroupIdentifier attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0082
+      command: "readAttribute"
+      attribute: "AliroReaderGroupSubIdentifier"
+      response:
+          value: aliroreadergrpsubidentifier
+
+    - label:
+          "Step 41a: TH reads AliroExpeditedTransactionSupportedProtocolVersions
+          attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0083
+      command: "readAttribute"
+      attribute: "AliroExpeditedTransactionSupportedProtocolVersions"
+      response:
+          saveAs: aliroprotocolversion
+          constraints:
+              type: list
+              maxLength: 16
+    - label:
+          "Step 41b: TH writes
+          AliroExpeditedTransactionSupportedProtocolVersions attribute as list
+          which is different from aliroprotocolversion"
+      PICS: DRLK.S.F0d && DRLK.S.A0083
+      command: "writeAttribute"
+      attribute: "AliroExpeditedTransactionSupportedProtocolVersions"
+      arguments:
+          value: ["0x1", "0x2"]
+      response:
+          error: UNSUPPORTED_WRITE
+    - label:
+          "Step 41c: TH reads AliroExpeditedTransactionSupportedProtocolVersions
+          attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0083
+      command: "readAttribute"
+      attribute: "AliroExpeditedTransactionSupportedProtocolVersions"
+      response:
+          value: aliroprotocolversion
+
+    - label: "Step 42a: TH reads AliroGroupResolvingKey attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0084
+      command: "readAttribute"
+      attribute: "AliroGroupResolvingKey"
+      response:
+          saveAs: alirogrpresolvingkey
+          constraints:
+              type: octet_string
+              minLength: 16
+
+    - label:
+          "Step 42b: TH writes AliroGroupResolvingKey attribute as octstr value
+          of length 16 which is different from alirogrpresolvingkey"
+      PICS: DRLK.S.F0d && DRLK.S.A0084
+      command: "writeAttribute"
+      attribute: "AliroGroupResolvingKey"
+      arguments:
+          value: "047a4c992d75368"
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 42c: TH reads AliroGroupResolvingKey attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0084
+      command: "readAttribute"
+      attribute: "AliroGroupResolvingKey"
+      response:
+          value: alirogrpresolvingkey
+    - label:
+          "Step 43a: TH reads AliroSupportedBLEUWBProtocolVersions attribute
+          from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0085
+      command: "readAttribute"
+      attribute: "AliroSupportedBLEUWBProtocolVersions"
+      response:
+          saveAs: alirobleuwbprotocolversion
+          constraints:
+              type: octet_string
+              minLength: 16
+
+    - label:
+          "Step 43b: TH writes AliroSupportedBLEUWBProtocolVersions attribute as
+          list which is different from alirobleuwbprotocolversion"
+      PICS: DRLK.S.F0d && DRLK.S.A0085
+      command: "writeAttribute"
+      attribute: "AliroSupportedBLEUWBProtocolVersions"
+      arguments:
+          value: "047a4c992d75368"
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 43c: TH reads AliroGroupResolvingKey attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0085
+      command: "readAttribute"
+      attribute: "AliroSupportedBLEUWBProtocolVersions"
+      response:
+          value: alirobleuwbprotocolversion
+
+    - label: "Step 44a: TH reads AliroBLEAdvertisingVersion attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0086
+      command: "readAttribute"
+      attribute: "AliroBLEAdvertisingVersion"
+      response:
+          saveAs: alirobleadvversion
+          constraints:
+              type: int8u
+              minValue: 0
+              maxValue: 255
+
+    - label:
+          "Step 44b: TH writes AliroBLEAdvertisingVersion attribute as any value
+          different from alirobleadvversion"
+      PICS: DRLK.S.F0d && DRLK.S.A0086
+      command: "writeAttribute"
+      attribute: "AliroBLEAdvertisingVersion"
+      arguments:
+          value: 85
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label: "Step 44c: TH reads AliroBLEAdvertisingVersion attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0086
+      command: "readAttribute"
+      attribute: "AliroBLEAdvertisingVersion"
+      response:
+          value: alirobleadvversion
+
+    - label:
+          "Step 45a: TH reads NumberOfAliroCredentialIssuerKeysSupported
+          attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0087
+      command: "readAttribute"
+      attribute: "NumberOfAliroCredentialIssuerKeysSupported"
+      response:
+          saveAs: alirokeysupported
+          constraints:
+              type: int16u
+              minValue: 0
+              maxValue: 65534
+
+    - label:
+          "Step 45b: TH writes NumberOfAliroCredentialIssuerKeysSupported
+          attribute as any value different from alirokeysupported"
+      PICS: DRLK.S.F0d && DRLK.S.A0087
+      command: "writeAttribute"
+      attribute: "NumberOfAliroCredentialIssuerKeysSupported"
+      arguments:
+          value: 30
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label:
+          "Step 45c: TH reads NumberOfAliroCredentialIssuerKeysSupported
+          attribute from DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0087
+      command: "readAttribute"
+      attribute: "NumberOfAliroCredentialIssuerKeysSupported"
+      response:
+          value: alirokeysupported
+
+    - label:
+          "Step 46a: TH reads NumberOfAliroEndpointKeysSupported attribute from
+          DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0088
+      command: "readAttribute"
+      attribute: "NumberOfAliroEndpointKeysSupported"
+      response:
+          saveAs: aliroepkeysupported
+          constraints:
+              type: int16u
+              minValue: 0
+              maxValue: 65534
+
+    - label:
+          "Step 46b: TH writes NumberOfAliroEndpointKeysSupported attribute as
+          any value different from aliroepkeysupported"
+      PICS: DRLK.S.F0d && DRLK.S.A0088
+      command: "writeAttribute"
+      attribute: "NumberOfAliroEndpointKeysSupported"
+      arguments:
+          value: 1000
+      response:
+          error: UNSUPPORTED_WRITE
+
+    - label:
+          "Step 46c: TH reads NumberOfAliroEndpointKeysSupported attribute from
+          DUT"
+      PICS: DRLK.S.F0d && DRLK.S.A0088
+      command: "readAttribute"
+      attribute: "NumberOfAliroEndpointKeysSupported"
+      response:
+          value: aliroepkeysupported
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 9ea99c627f16f4..aa884e382000b7 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -1517,11 +1517,21 @@ DRLK.S.A0031=1
 DRLK.S.A0032=1
 DRLK.S.A0033=1
 DRLK.S.A0035=0
+DRLK.S.A0080=0
+DRLK.S.A0081=0
+DRLK.S.A0082=0
+DRLK.S.A0083=0
+DRLK.S.A0084=0
+DRLK.S.A0085=0
+DRLK.S.A0086=0
+DRLK.S.A0087=0
+DRLK.S.A0088=0
 
 #ReadOnly attributes
 DRLK.S.A0028.ReadOnly=1
 DRLK.S.A002c.ReadOnly=1
 
+
 #write attributes
 DRLK.S.M.SimulateNotFullyLocked=1
 DRLK.S.M.DetectLockJammed=1
@@ -1562,6 +1572,8 @@ DRLK.S.F08=1
 DRLK.S.F0a=1
 DRLK.S.F0b=1
 DRLK.S.F0c=1
+DRLK.S.F0d=0
+DRLK.S.F0e=0
 
 # Server Commands
 DRLK.S.C00.Rsp=1
@@ -1583,6 +1595,8 @@ DRLK.S.C22.Rsp=1
 DRLK.S.C24.Rsp=1
 DRLK.S.C26.Rsp=1
 DRLK.S.C27.Rsp=1
+DRLK.S.C28.Rsp=0
+DRLK.S.C29.Rsp=0
 DRLK.S.C0c.Tx=1
 DRLK.S.C0f.Tx=1
 DRLK.S.C12.Tx=1