diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
index 312e55c7acf0..505dddb7cf92 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
@@ -1320,6 +1320,18 @@
         "modelAsString": false
       }
     },
+    "PublicNetworkAccess": {
+      "type": "string",
+      "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
+      "enum": [
+        "Enabled",
+        "Disabled"
+      ],
+      "x-ms-enum": {
+        "name": "PublicNetworkAccessEnum",
+        "modelAsString": true
+      }
+    },
     "ServerPrivateEndpointConnection": {
       "description": "A private endpoint connection under a server",
       "type": "object",
@@ -1498,16 +1510,8 @@
           "description": "The maximum number of replicas that a master server can have."
         },
         "publicNetworkAccess": {
-          "type": "string",
-          "description": "Whether or not public endpoint access is allowed for this server.  Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "x-ms-enum": {
-            "name": "PublicNetworkAccessEnum",
-            "modelAsString": true
-          }
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
         },
         "privateEndpointConnections": {
           "description": "List of private endpoint connections on a server",
@@ -1572,6 +1576,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "publicNetworkAccess": {
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+        },
         "storageProfile": {
           "$ref": "#/definitions/StorageProfile",
           "description": "Storage profile of a server."
@@ -1786,6 +1794,10 @@
               "$ref": "#/definitions/SslEnforcement",
               "description": "Enable ssl enforcement or not when connect to server."
             },
+            "publicNetworkAccess": {
+              "$ref": "#/definitions/PublicNetworkAccess",
+              "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+            },
             "replicationRole": {
               "type": "string",
               "description": "The replication role of the server."
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
index 39620018d6bd..7f9bebd28eab 100644
--- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
+++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
@@ -1522,6 +1522,30 @@
         "modelAsString": true
       }
     },
+    "InfrastructureEncryption": {
+      "type": "string",
+      "description": "Status showing whether the server enabled infrastructure encryption.",
+      "enum": [
+        "Enabled",
+        "Disabled"
+      ],
+      "x-ms-enum": {
+        "name": "InfrastructureEncryption",
+        "modelAsString": true
+      }
+    },
+    "PublicNetworkAccess": {
+      "type": "string",
+      "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
+      "enum": [
+        "Enabled",
+        "Disabled"
+      ],
+      "x-ms-enum": {
+        "name": "PublicNetworkAccessEnum",
+        "modelAsString": true
+      }
+    },
     "ServerPrivateEndpointConnection": {
       "description": "A private endpoint connection under a server",
       "type": "object",
@@ -1665,16 +1689,8 @@
           "readOnly": true
         },
         "infrastructureEncryption": {
-          "type": "string",
-          "description": "Status showing whether the server enabled infrastructure encryption.",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "x-ms-enum": {
-            "name": "InfrastructureEncryption",
-            "modelAsString": true
-          }
+          "$ref": "#/definitions/InfrastructureEncryption",
+          "description": "Status showing whether the server enabled infrastructure encryption."
         },
         "userVisibleState": {
           "type": "string",
@@ -1718,16 +1734,8 @@
           "description": "The maximum number of replicas that a master server can have."
         },
         "publicNetworkAccess": {
-          "type": "string",
-          "description": "Whether or not public endpoint access is allowed for this server.  Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "x-ms-enum": {
-            "name": "PublicNetworkAccessEnum",
-            "modelAsString": true
-          }
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
         },
         "privateEndpointConnections": {
           "description": "List of private endpoint connections on a server",
@@ -1796,6 +1804,14 @@
           "$ref": "#/definitions/MinimalTlsVersion",
           "description": "Enforce a minimal Tls version for the server."
         },
+        "infrastructureEncryption": {
+          "$ref": "#/definitions/InfrastructureEncryption",
+          "description": "Status showing whether the server enabled infrastructure encryption."
+        },
+        "publicNetworkAccess": {
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+        },
         "storageProfile": {
           "$ref": "#/definitions/StorageProfile",
           "description": "Storage profile of a server."
@@ -1991,6 +2007,10 @@
     },
     "ServerForCreate": {
       "properties": {
+        "identity": {
+          "$ref": "#/definitions/ResourceIdentity",
+          "description": "The Azure Active Directory identity of the server."
+        },
         "sku": {
           "$ref": "#/definitions/Sku",
           "description": "The SKU (pricing tier) of the server."
@@ -2020,6 +2040,10 @@
     },
     "ServerUpdateParameters": {
       "properties": {
+        "identity": {
+          "$ref": "#/definitions/ResourceIdentity",
+          "description": "The Azure Active Directory identity of the server."
+        },
         "sku": {
           "$ref": "#/definitions/Sku",
           "description": "The SKU (pricing tier) of the server."
@@ -2047,6 +2071,10 @@
               "$ref": "#/definitions/MinimalTlsVersion",
               "description": "Enforce a minimal Tls version for the server."
             },
+            "publicNetworkAccess": {
+              "$ref": "#/definitions/PublicNetworkAccess",
+              "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+            },
             "replicationRole": {
               "type": "string",
               "description": "The replication role of the server."
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
index 5832b59dc9c4..59450f0fab7b 100644
--- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
+++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
@@ -1525,6 +1525,30 @@
         "modelAsString": true
       }
     },
+    "InfrastructureEncryption": {
+      "type": "string",
+      "description": "Status showing whether the server enabled infrastructure encryption.",
+      "enum": [
+        "Enabled",
+        "Disabled"
+      ],
+      "x-ms-enum": {
+        "name": "InfrastructureEncryption",
+        "modelAsString": true
+      }
+    },
+    "PublicNetworkAccess": {
+      "type": "string",
+      "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
+      "enum": [
+        "Enabled",
+        "Disabled"
+      ],
+      "x-ms-enum": {
+        "name": "PublicNetworkAccessEnum",
+        "modelAsString": true
+      }
+    },
     "ServerPrivateEndpointConnection": {
       "description": "A private endpoint connection under a server",
       "type": "object",
@@ -1668,16 +1692,8 @@
           "readOnly": true
         },
         "infrastructureEncryption": {
-          "type": "string",
-          "description": "Status showing whether the server enabled infrastructure encryption.",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "x-ms-enum": {
-            "name": "InfrastructureEncryption",
-            "modelAsString": true
-          }
+          "$ref": "#/definitions/InfrastructureEncryption",
+          "description": "Status showing whether the server enabled infrastructure encryption."
         },
         "userVisibleState": {
           "type": "string",
@@ -1721,16 +1737,8 @@
           "description": "The maximum number of replicas that a master server can have."
         },
         "publicNetworkAccess": {
-          "type": "string",
-          "description": "Whether or not public endpoint access is allowed for this server.  Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "x-ms-enum": {
-            "name": "PublicNetworkAccessEnum",
-            "modelAsString": true
-          }
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
         },
         "privateEndpointConnections": {
           "description": "List of private endpoint connections on a server",
@@ -1799,6 +1807,14 @@
           "$ref": "#/definitions/MinimalTlsVersion",
           "description": "Enforce a minimal Tls version for the server."
         },
+        "infrastructureEncryption": {
+          "$ref": "#/definitions/InfrastructureEncryption",
+          "description": "Status showing whether the server enabled infrastructure encryption."
+        },
+        "publicNetworkAccess": {
+          "$ref": "#/definitions/PublicNetworkAccess",
+          "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+        },
         "storageProfile": {
           "$ref": "#/definitions/StorageProfile",
           "description": "Storage profile of a server."
@@ -1994,6 +2010,10 @@
     },
     "ServerForCreate": {
       "properties": {
+        "identity": {
+          "$ref": "#/definitions/ResourceIdentity",
+          "description": "The Azure Active Directory identity of the server."
+        },
         "sku": {
           "$ref": "#/definitions/Sku",
           "description": "The SKU (pricing tier) of the server."
@@ -2023,6 +2043,10 @@
     },
     "ServerUpdateParameters": {
       "properties": {
+        "identity": {
+          "$ref": "#/definitions/ResourceIdentity",
+          "description": "The Azure Active Directory identity of the server."
+        },
         "sku": {
           "$ref": "#/definitions/Sku",
           "description": "The SKU (pricing tier) of the server."
@@ -2050,6 +2074,10 @@
               "$ref": "#/definitions/MinimalTlsVersion",
               "description": "Enforce a minimal Tls version for the server."
             },
+            "publicNetworkAccess": {
+              "$ref": "#/definitions/PublicNetworkAccess",
+              "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
+            },
             "replicationRole": {
               "type": "string",
               "description": "The replication role of the server."