diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index d4f169b1fb..957107deb5 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -109,8 +109,7 @@ jobs:
       - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
+          templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/deploy.test.bicep
new file mode 100644
index 0000000000..2803a12203
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/deploy.test.bicep
@@ -0,0 +1,31 @@
+targetScope = 'managementGroup'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardmgcom'
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../managementGroup/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/*'
+      'Microsoft.Network/virtualNetworks/read'
+    ]
+    assignableScopes: [
+      managementGroup().id
+    ]
+    description: 'Test Custom Role Definition Standard (management group scope)'
+    notActions: [
+      'Microsoft.Compute/images/delete'
+      'Microsoft.Compute/images/write'
+      'Microsoft.Network/virtualNetworks/subnets/join/action'
+    ]
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min.parameters.json
deleted file mode 100644
index c4a88ba9e8..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min.parameters.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-mg-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/deploy.test.bicep
new file mode 100644
index 0000000000..ae775efdd0
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/deploy.test.bicep
@@ -0,0 +1,22 @@
+targetScope = 'managementGroup'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardmgmin'
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../managementGroup/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/images/read'
+      'Microsoft.Compute/galleries/read'
+    ]
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/mg.parameters.json
deleted file mode 100644
index d49ce1cae3..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-mg"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (management group scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/providers/Microsoft.Management/managementGroups/<<managementGroupId>>"
-            ]
-        },
-        "managementGroupId": {
-            "value": "<<managementGroupId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/deploy.test.bicep
new file mode 100644
index 0000000000..e4004b87fe
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/deploy.test.bicep
@@ -0,0 +1,56 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'ms.authorization.roledefinitions-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardrgcom'
+
+// =========== //
+// Deployments //
+// =========== //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+  name: resourceGroupName
+  location: location
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../resourceGroup/deploy.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/*'
+      'Microsoft.Network/virtualNetworks/read'
+    ]
+    assignableScopes: [
+      resourceGroup.id
+    ]
+    dataActions: [
+      'Microsoft.Storage/storageAccounts/blobServices/*/read'
+    ]
+    description: 'Test Custom Role Definition Standard (resource group scope)'
+    notActions: [
+      'Microsoft.Compute/images/delete'
+      'Microsoft.Compute/images/write'
+      'Microsoft.Network/virtualNetworks/subnets/join/action'
+    ]
+    notDataActions: [
+      'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read'
+    ]
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min.parameters.json
deleted file mode 100644
index cf6825cc02..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min.parameters.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-rg-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/deploy.test.bicep
new file mode 100644
index 0000000000..905c662c79
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/deploy.test.bicep
@@ -0,0 +1,41 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for testing purposes.')
+@maxLength(90)
+param resourceGroupName string = 'ms.authorization.roledefinitions-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to.')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardrgmin'
+
+// =========== //
+// Deployments //
+// =========== //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+  name: resourceGroupName
+  location: location
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../resourceGroup/deploy.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/images/read'
+      'Microsoft.Compute/galleries/read'
+    ]
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/rg.parameters.json
deleted file mode 100644
index c27ff2f862..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-rg"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (resource group scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        },
-        "resourceGroupName": {
-            "value": "<<resourceGroupName>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/deploy.test.bicep
new file mode 100644
index 0000000000..e9bb5500fb
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/deploy.test.bicep
@@ -0,0 +1,37 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardsubcom'
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../subscription/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/*'
+      'Microsoft.Network/virtualNetworks/read'
+    ]
+    assignableScopes: [
+      subscription().id
+    ]
+    dataActions: [
+      'Microsoft.Storage/storageAccounts/blobServices/*/read'
+    ]
+    description: 'Test Custom Role Definition Standard (subscription scope)'
+    notActions: [
+      'Microsoft.Compute/images/delete'
+      'Microsoft.Compute/images/write'
+      'Microsoft.Network/virtualNetworks/subnets/join/action'
+    ]
+    notDataActions: [
+      'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read'
+    ]
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min.parameters.json
deleted file mode 100644
index 87bbbc20b7..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min.parameters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-sub-min"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/read",
-                "Microsoft.Compute/galleries/images/read"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/deploy.test.bicep b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/deploy.test.bicep
new file mode 100644
index 0000000000..a07bf12786
--- /dev/null
+++ b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/deploy.test.bicep
@@ -0,0 +1,23 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
+param serviceShort string = 'ardsubmin'
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../subscription/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    roleName: '<<namePrefix>>-testRole-${serviceShort}'
+    actions: [
+      'Microsoft.Compute/galleries/images/read'
+      'Microsoft.Compute/galleries/read'
+    ]
+    subscriptionId: subscription().subscriptionId
+  }
+}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.parameters.json b/modules/Microsoft.Authorization/roleDefinitions/.test/sub.parameters.json
deleted file mode 100644
index 62e03ca98d..0000000000
--- a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.parameters.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "roleName": {
-            "value": "<<namePrefix>>-az-testRole-sub"
-        },
-        "description": {
-            "value": "Test Custom Role Definition Standard (subscription scope)"
-        },
-        "actions": {
-            "value": [
-                "Microsoft.Compute/galleries/*",
-                "Microsoft.Network/virtualNetworks/read"
-            ]
-        },
-        "notActions": {
-            "value": [
-                "Microsoft.Compute/images/write",
-                "Microsoft.Compute/images/delete",
-                "Microsoft.Network/virtualNetworks/subnets/join/action"
-            ]
-        },
-        "dataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/*/read"
-            ]
-        },
-        "notDataActions": {
-            "value": [
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-            ]
-        },
-        "assignableScopes": {
-            "value": [
-                "/subscriptions/<<subscriptionId>>"
-            ]
-        },
-        "subscriptionId": {
-            "value": "<<subscriptionId>>"
-        }
-    }
-}
diff --git a/modules/Microsoft.Authorization/roleDefinitions/readme.md b/modules/Microsoft.Authorization/roleDefinitions/readme.md
index 6b55fbdd11..bc1f4fde5d 100644
--- a/modules/Microsoft.Authorization/roleDefinitions/readme.md
+++ b/modules/Microsoft.Authorization/roleDefinitions/readme.md
@@ -181,7 +181,7 @@ The following module usage examples are retrieved from the content of the files
 
    >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
 
-<h3>Example 1: Mg Min</h3>
+<h3>Example 1: Mg.Common</h3>
 
 <details>
 
@@ -189,82 +189,24 @@ The following module usage examples are retrieved from the content of the files
 
 ```bicep
 module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
+  name: '${uniqueString(deployment().name)}-test-ardmgcom'
   params: {
     // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-mg-min'
-    // Non-required parameters
-    actions: [
-      'Microsoft.Compute/galleries/images/read'
-      'Microsoft.Compute/galleries/read'
-    ]
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    // Required parameters
-    "roleName": {
-      "value": "<<namePrefix>>-az-testRole-mg-min"
-    },
-    // Non-required parameters
-    "actions": {
-      "value": [
-        "Microsoft.Compute/galleries/images/read",
-        "Microsoft.Compute/galleries/read"
-      ]
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<h3>Example 2: Mg</h3>
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
-  params: {
-    // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-mg'
+    roleName: '<<namePrefix>>-testRole-ardmgcom'
     // Non-required parameters
     actions: [
       'Microsoft.Compute/galleries/*'
       'Microsoft.Network/virtualNetworks/read'
     ]
     assignableScopes: [
-      '/providers/Microsoft.Management/managementGroups/<<managementGroupId>>'
-    ]
-    dataActions: [
-      'Microsoft.Storage/storageAccounts/blobServices/*/read'
+      '<id>'
     ]
     description: 'Test Custom Role Definition Standard (management group scope)'
-    managementGroupId: '<<managementGroupId>>'
     notActions: [
       'Microsoft.Compute/images/delete'
       'Microsoft.Compute/images/write'
       'Microsoft.Network/virtualNetworks/subnets/join/action'
     ]
-    notDataActions: [
-      'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read'
-    ]
   }
 }
 ```
@@ -283,7 +225,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
   "parameters": {
     // Required parameters
     "roleName": {
-      "value": "<<namePrefix>>-az-testRole-mg"
+      "value": "<<namePrefix>>-testRole-ardmgcom"
     },
     // Non-required parameters
     "actions": {
@@ -294,31 +236,18 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
     },
     "assignableScopes": {
       "value": [
-        "/providers/Microsoft.Management/managementGroups/<<managementGroupId>>"
-      ]
-    },
-    "dataActions": {
-      "value": [
-        "Microsoft.Storage/storageAccounts/blobServices/*/read"
+        "<id>"
       ]
     },
     "description": {
       "value": "Test Custom Role Definition Standard (management group scope)"
     },
-    "managementGroupId": {
-      "value": "<<managementGroupId>>"
-    },
     "notActions": {
       "value": [
         "Microsoft.Compute/images/delete",
         "Microsoft.Compute/images/write",
         "Microsoft.Network/virtualNetworks/subnets/join/action"
       ]
-    },
-    "notDataActions": {
-      "value": [
-        "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
-      ]
     }
   }
 }
@@ -327,7 +256,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 </details>
 <p>
 
-<h3>Example 3: Rg Min</h3>
+<h3>Example 2: Mg.Min</h3>
 
 <details>
 
@@ -335,17 +264,15 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 
 ```bicep
 module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
+  name: '${uniqueString(deployment().name)}-test-ardmgmin'
   params: {
     // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-rg-min'
+    roleName: '<<namePrefix>>-testRole-ardmgmin'
     // Non-required parameters
     actions: [
       'Microsoft.Compute/galleries/images/read'
       'Microsoft.Compute/galleries/read'
     ]
-    resourceGroupName: '<<resourceGroupName>>'
-    subscriptionId: '<<subscriptionId>>'
   }
 }
 ```
@@ -364,7 +291,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
   "parameters": {
     // Required parameters
     "roleName": {
-      "value": "<<namePrefix>>-az-testRole-rg-min"
+      "value": "<<namePrefix>>-testRole-ardmgmin"
     },
     // Non-required parameters
     "actions": {
@@ -372,12 +299,6 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
         "Microsoft.Compute/galleries/images/read",
         "Microsoft.Compute/galleries/read"
       ]
-    },
-    "resourceGroupName": {
-      "value": "<<resourceGroupName>>"
-    },
-    "subscriptionId": {
-      "value": "<<subscriptionId>>"
     }
   }
 }
@@ -386,7 +307,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 </details>
 <p>
 
-<h3>Example 4: Rg</h3>
+<h3>Example 3: Rg.Common</h3>
 
 <details>
 
@@ -394,17 +315,17 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 
 ```bicep
 module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
+  name: '${uniqueString(deployment().name)}-test-ardrgcom'
   params: {
     // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-rg'
+    roleName: '<<namePrefix>>-testRole-ardrgcom'
     // Non-required parameters
     actions: [
       'Microsoft.Compute/galleries/*'
       'Microsoft.Network/virtualNetworks/read'
     ]
     assignableScopes: [
-      '/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>'
+      '<id>'
     ]
     dataActions: [
       'Microsoft.Storage/storageAccounts/blobServices/*/read'
@@ -418,8 +339,6 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
     notDataActions: [
       'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read'
     ]
-    resourceGroupName: '<<resourceGroupName>>'
-    subscriptionId: '<<subscriptionId>>'
   }
 }
 ```
@@ -438,7 +357,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
   "parameters": {
     // Required parameters
     "roleName": {
-      "value": "<<namePrefix>>-az-testRole-rg"
+      "value": "<<namePrefix>>-testRole-ardrgcom"
     },
     // Non-required parameters
     "actions": {
@@ -449,7 +368,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
     },
     "assignableScopes": {
       "value": [
-        "/subscriptions/<<subscriptionId>>/resourceGroups/<<resourceGroupName>>"
+        "<id>"
       ]
     },
     "dataActions": {
@@ -471,12 +390,6 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
       "value": [
         "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
       ]
-    },
-    "resourceGroupName": {
-      "value": "<<resourceGroupName>>"
-    },
-    "subscriptionId": {
-      "value": "<<subscriptionId>>"
     }
   }
 }
@@ -485,7 +398,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 </details>
 <p>
 
-<h3>Example 5: Sub Min</h3>
+<h3>Example 4: Rg.Min</h3>
 
 <details>
 
@@ -493,16 +406,15 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 
 ```bicep
 module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
+  name: '${uniqueString(deployment().name)}-test-ardrgmin'
   params: {
     // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-sub-min'
+    roleName: '<<namePrefix>>-testRole-ardrgmin'
     // Non-required parameters
     actions: [
       'Microsoft.Compute/galleries/images/read'
       'Microsoft.Compute/galleries/read'
     ]
-    subscriptionId: '<<subscriptionId>>'
   }
 }
 ```
@@ -521,7 +433,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
   "parameters": {
     // Required parameters
     "roleName": {
-      "value": "<<namePrefix>>-az-testRole-sub-min"
+      "value": "<<namePrefix>>-testRole-ardrgmin"
     },
     // Non-required parameters
     "actions": {
@@ -529,9 +441,6 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
         "Microsoft.Compute/galleries/images/read",
         "Microsoft.Compute/galleries/read"
       ]
-    },
-    "subscriptionId": {
-      "value": "<<subscriptionId>>"
     }
   }
 }
@@ -540,7 +449,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 </details>
 <p>
 
-<h3>Example 6: Sub</h3>
+<h3>Example 5: Sub.Common</h3>
 
 <details>
 
@@ -548,17 +457,17 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
 
 ```bicep
 module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-RoleDefinitions'
+  name: '${uniqueString(deployment().name)}-test-ardsubcom'
   params: {
     // Required parameters
-    roleName: '<<namePrefix>>-az-testRole-sub'
+    roleName: '<<namePrefix>>-testRole-ardsubcom'
     // Non-required parameters
     actions: [
       'Microsoft.Compute/galleries/*'
       'Microsoft.Network/virtualNetworks/read'
     ]
     assignableScopes: [
-      '/subscriptions/<<subscriptionId>>'
+      '<id>'
     ]
     dataActions: [
       'Microsoft.Storage/storageAccounts/blobServices/*/read'
@@ -572,7 +481,6 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
     notDataActions: [
       'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read'
     ]
-    subscriptionId: '<<subscriptionId>>'
   }
 }
 ```
@@ -591,7 +499,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
   "parameters": {
     // Required parameters
     "roleName": {
-      "value": "<<namePrefix>>-az-testRole-sub"
+      "value": "<<namePrefix>>-testRole-ardsubcom"
     },
     // Non-required parameters
     "actions": {
@@ -602,7 +510,7 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
     },
     "assignableScopes": {
       "value": [
-        "/subscriptions/<<subscriptionId>>"
+        "<id>"
       ]
     },
     "dataActions": {
@@ -624,9 +532,61 @@ module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep'
       "value": [
         "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/read"
       ]
+    }
+  }
+}
+```
+
+</details>
+<p>
+
+<h3>Example 6: Sub.Min</h3>
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module roleDefinitions './Microsoft.Authorization/roleDefinitions/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-ardsubmin'
+  params: {
+    // Required parameters
+    roleName: '<<namePrefix>>-testRole-ardsubmin'
+    // Non-required parameters
+    actions: [
+      'Microsoft.Compute/galleries/images/read'
+      'Microsoft.Compute/galleries/read'
+    ]
+    subscriptionId: '<subscriptionId>'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    // Required parameters
+    "roleName": {
+      "value": "<<namePrefix>>-testRole-ardsubmin"
+    },
+    // Non-required parameters
+    "actions": {
+      "value": [
+        "Microsoft.Compute/galleries/images/read",
+        "Microsoft.Compute/galleries/read"
+      ]
     },
     "subscriptionId": {
-      "value": "<<subscriptionId>>"
+      "value": "<subscriptionId>"
     }
   }
 }