diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index 4a162b3985..e3afd3cff2 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -43,6 +43,7 @@ stages:
           removeDeployment: '${{ parameters.removeDeployment }}'
           deploymentBlocks:
             - path: $(modulePath)/.parameters/parameters.json
+            - path: $(modulePath)/.parameters/admin.parameters.json
 
   - stage: Publishing
     displayName: Publish module
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index c9972e5fc1..5a4a76bfb9 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        parameterFilePaths: ['parameters.json']
+        parameterFilePaths: ['admin.parameters.json', 'parameters.json']
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
diff --git a/arm/Microsoft.Sql/servers/.parameters/admin.parameters.json b/arm/Microsoft.Sql/servers/.parameters/admin.parameters.json
new file mode 100644
index 0000000000..eadb38deec
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/.parameters/admin.parameters.json
@@ -0,0 +1,18 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "name": {
+            "value": "<<namePrefix>>-az-sqlsrv-admin-001"
+        },
+        "administrators": {
+            "value": {
+                "azureADOnlyAuthentication": true,
+                "login": "myspn",
+                "sid": "<<deploymentSpId>>",
+                "principalType": "Application",
+                "tenantId": "<<tenantId>>"
+            }
+        }
+    }
+}
diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/arm/Microsoft.Sql/servers/.parameters/parameters.json
index e992fdbc54..32582f8e38 100644
--- a/arm/Microsoft.Sql/servers/.parameters/parameters.json
+++ b/arm/Microsoft.Sql/servers/.parameters/parameters.json
@@ -2,6 +2,9 @@
     "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
+        "name": {
+            "value": "<<namePrefix>>-az-sqlsrv-x-001"
+        },
         "administratorLogin": {
             "reference": {
                 "keyVault": {
@@ -18,21 +21,9 @@
                 "secretName": "administratorLoginPassword"
             }
         },
-        "administrators": {
-            "value": {
-                "azureADOnlyAuthentication": false,
-                "login": "John Doe",
-                "sid": "<<deploymentSpId>>",
-                "principalType": "Application",
-                "tenantId": "<<tenantId>>"
-            }
-        },
         "location": {
             "value": "westeurope"
         },
-        "name": {
-            "value": "<<namePrefix>>-az-sqlsrv-x-001"
-        },
         "roleAssignments": {
             "value": [
                 {
@@ -87,4 +78,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md
index ff928a6e30..26910ff65f 100644
--- a/arm/Microsoft.Sql/servers/readme.md
+++ b/arm/Microsoft.Sql/servers/readme.md
@@ -93,13 +93,13 @@ https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/administr
 ```json
 "administrators": {
     "value": {
-        "azureADOnlyAuthentication": false
-        "login": "John Doe"
-        "sid": "<<objectId>>"
+        "azureADOnlyAuthentication": true
+        "login": "John Doe" // if application can be anything
+        "sid": "<<objectId>>" // if application, the object ID
         "principalType" : "User" // options: "User", "Group", "Application"
         "tenantId": "<<tenantId>>"
     }
-},
+}
 ```
 
 ## Outputs