diff --git a/specification/redisenterprise/resource-manager/readme.az.md b/specification/redisenterprise/resource-manager/readme.az.md
index 79f399d7b5e9..21b09ba7c2ab 100644
--- a/specification/redisenterprise/resource-manager/readme.az.md
+++ b/specification/redisenterprise/resource-manager/readme.az.md
@@ -21,30 +21,82 @@ python-sdk-output-folder: "$(az-output-folder)/vendored_sdks/redisenterprise"
 
 Additional configuration specific for Azure CLI
 
-``` yaml
+``` yaml $(az)
 extension-mode: stable
 
+directive:
+  - where:
+      group: redisenterprise redis-enterprise
+    set:
+      group: redisenterprise
+  - where:
+      command: redisenterprise database list-key
+    set:
+      command: redisenterprise database list-keys
+
 cli:
     cli-directive:
+      - where:
+          group: '*'
+          op: '*'
+          param: 'sku'
+        cli-flatten: true
+      - where:
+          group: 'RedisEnterprise'
+          op: 'Create'
+          param: 'name'
+        required: true
+      - where:
+          group: '*'
+          op: '*'
+          param: 'name'
+        name: 'sku'
       - where:
           group: '*'
           op: '*'
           param: 'clusterName'
         alias:
-          - cluster_name
-          - name
-          - n
+          - 'cluster_name'
+          - 'name'
+          - 'n'
       - where:
           group: '*'
           op: '*'
           param: 'zones'
         alias:
-          - zones
-          - z
-
-directive:
-  - where:
-      group: redisenterprise redis-enterprise
-    set:
-      group: redisenterprise
+          - 'zones'
+          - 'z'
+      - where:
+          group: 'Databases'
+          op: 'Update'
+          param: 'clusteringPolicy'
+        hidden: true
+      - where:
+          group: 'Databases'
+          op: 'Update'
+          param: 'modules'
+        hidden: true
+      - where:
+          group: 'Databases'
+          op: 'Update'
+          param: 'port'
+        hidden: true
+      - where:
+          group: '*'
+          op: '*'
+          param: 'databaseName'
+        default-value: 'default'
+        hidden: true
+      - where:
+          group: 'PrivateEndpointConnections'
+        hidden: true
+      - where:
+          group: 'PrivateLinkResources'
+        hidden: true
+      - where:
+          group: '*'
+          op: '*'
+          param: 'persistence'
+        set:
+          extensionMode: 'preview'
 ```
diff --git a/specification/redisenterprise/resource-manager/readme.cli.md b/specification/redisenterprise/resource-manager/readme.cli.md
index 73967f0e71c8..7cb4a841a54f 100644
--- a/specification/redisenterprise/resource-manager/readme.cli.md
+++ b/specification/redisenterprise/resource-manager/readme.cli.md
@@ -1,4 +1,31 @@
-``` yaml
-# add any configuration here for all CLI languages
-# refer to the faq.md for more details
+## CLI
+
+These settings apply only when `--cli` is specified on the command line.
+
+``` yaml $(cli)
+cli:
+  cli-name: redisenterprise
+  test-scenario:
+    redisenterprise_scenario1:
+      - name: /RedisEnterprise/put/RedisEnterpriseCreate
+      - name: /RedisEnterprise/get/RedisEnterpriseGet
+      - name: /RedisEnterprise/get/RedisEnterpriseList
+      - name: /RedisEnterprise/get/RedisEnterpriseListByResourceGroup
+      - name: /Databases/get/RedisEnterpriseDatabasesGet
+      - name: /Databases/get/RedisEnterpriseDatabasesListByCluster
+      - name: /Databases/post/RedisEnterpriseDatabasesListKeys
+      - name: /Databases/post/RedisEnterpriseDatabasesRegenerateKey
+      - name: /RedisEnterprise/delete/RedisEnterpriseDelete
+    redisenterprise_scenario2:
+      - name: /RedisEnterprise/put/RedisEnterpriseCreate
+      - name: /RedisEnterprise/get/RedisEnterpriseGet
+      - name: /RedisEnterprise/get/RedisEnterpriseList
+      - name: /RedisEnterprise/get/RedisEnterpriseListByResourceGroup
+      - name: /Databases/put/RedisEnterpriseDatabasesCreate
+      - name: /Databases/get/RedisEnterpriseDatabasesGet
+      - name: /Databases/get/RedisEnterpriseDatabasesListByCluster
+      - name: /Databases/post/RedisEnterpriseDatabasesListKeys
+      - name: /Databases/post/RedisEnterpriseDatabasesRegenerateKey
+      - name: /Databases/delete/RedisEnterpriseDatabasesDelete
+      - name: /RedisEnterprise/delete/RedisEnterpriseDelete
 ```