diff --git a/avm/res/operational-insights/workspace/README.md b/avm/res/operational-insights/workspace/README.md
index 8ea1cf3c5c..1d86fc74b0 100644
--- a/avm/res/operational-insights/workspace/README.md
+++ b/avm/res/operational-insights/workspace/README.md
@@ -18,14 +18,14 @@ This module deploys a Log Analytics Workspace.
 | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
-| `Microsoft.OperationalInsights/workspaces` | [2022-10-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2022-10-01/workspaces) |
-| `Microsoft.OperationalInsights/workspaces/dataExports` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataExports) |
-| `Microsoft.OperationalInsights/workspaces/dataSources` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataSources) |
-| `Microsoft.OperationalInsights/workspaces/linkedServices` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedServices) |
-| `Microsoft.OperationalInsights/workspaces/linkedStorageAccounts` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedStorageAccounts) |
-| `Microsoft.OperationalInsights/workspaces/savedSearches` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/savedSearches) |
-| `Microsoft.OperationalInsights/workspaces/storageInsightConfigs` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/storageInsightConfigs) |
-| `Microsoft.OperationalInsights/workspaces/tables` | [2022-10-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2022-10-01/workspaces/tables) |
+| `Microsoft.OperationalInsights/workspaces` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces) |
+| `Microsoft.OperationalInsights/workspaces/dataExports` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/dataExports) |
+| `Microsoft.OperationalInsights/workspaces/dataSources` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/dataSources) |
+| `Microsoft.OperationalInsights/workspaces/linkedServices` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/linkedServices) |
+| `Microsoft.OperationalInsights/workspaces/linkedStorageAccounts` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/linkedStorageAccounts) |
+| `Microsoft.OperationalInsights/workspaces/savedSearches` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/savedSearches) |
+| `Microsoft.OperationalInsights/workspaces/storageInsightConfigs` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/storageInsightConfigs) |
+| `Microsoft.OperationalInsights/workspaces/tables` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/tables) |
 | `Microsoft.OperationsManagement/solutions` | [2015-11-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationsManagement/2015-11-01-preview/solutions) |
 | `Microsoft.SecurityInsights/onboardingStates` | [2024-03-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.SecurityInsights/2024-03-01/onboardingStates) |
 
@@ -198,6 +198,9 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         useThisWorkspace: true
       }
     ]
+    features: {
+      enableLogAccessUsingOnlyResourcePermissions: true
+    }
     gallerySolutions: [
       {
         name: 'AzureAutomation(oiwadv001)'
@@ -338,7 +341,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
       'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
-    useResourcePermissions: true
   }
 }
 ```
@@ -508,6 +510,11 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         }
       ]
     },
+    "features": {
+      "value": {
+        "enableLogAccessUsingOnlyResourcePermissions": true
+      }
+    },
     "gallerySolutions": {
       "value": [
         {
@@ -669,9 +676,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
-    },
-    "useResourcePermissions": {
-      "value": true
     }
   }
 }
@@ -830,6 +834,9 @@ param diagnosticSettings = [
     useThisWorkspace: true
   }
 ]
+param features = {
+  enableLogAccessUsingOnlyResourcePermissions: true
+}
 param gallerySolutions = [
   {
     name: 'AzureAutomation(oiwadv001)'
@@ -970,7 +977,6 @@ param tags = {
   'hidden-title': 'This is visible in the resource name'
   Role: 'DeploymentValidation'
 }
-param useResourcePermissions = true
 ```
 
 </details>
@@ -1161,6 +1167,12 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
+    features: {
+      disableLocalAuth: true
+      enableDataExport: true
+      enableLogAccessUsingOnlyResourcePermissions: true
+      immediatePurgeDataOn30Days: true
+    }
     gallerySolutions: [
       {
         name: 'AzureAutomation(oiwmax001)'
@@ -1348,7 +1360,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
       'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
-    useResourcePermissions: true
   }
 }
 ```
@@ -1481,6 +1492,14 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         }
       ]
     },
+    "features": {
+      "value": {
+        "disableLocalAuth": true,
+        "enableDataExport": true,
+        "enableLogAccessUsingOnlyResourcePermissions": true,
+        "immediatePurgeDataOn30Days": true
+      }
+    },
     "gallerySolutions": {
       "value": [
         {
@@ -1695,9 +1714,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
-    },
-    "useResourcePermissions": {
-      "value": true
     }
   }
 }
@@ -1821,6 +1837,12 @@ param diagnosticSettings = [
     workspaceResourceId: '<workspaceResourceId>'
   }
 ]
+param features = {
+  disableLocalAuth: true
+  enableDataExport: true
+  enableLogAccessUsingOnlyResourcePermissions: true
+  immediatePurgeDataOn30Days: true
+}
 param gallerySolutions = [
   {
     name: 'AzureAutomation(oiwmax001)'
@@ -2008,7 +2030,6 @@ param tags = {
   'hidden-title': 'This is visible in the resource name'
   Role: 'DeploymentValidation'
 }
-param useResourcePermissions = true
 ```
 
 </details>
@@ -2129,6 +2150,9 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
+    features: {
+      enableLogAccessUsingOnlyResourcePermissions: true
+    }
     gallerySolutions: [
       {
         name: 'AzureAutomation(oiwwaf001)'
@@ -2173,7 +2197,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
       'hidden-title': 'This is visible in the resource name'
       Role: 'DeploymentValidation'
     }
-    useResourcePermissions: true
   }
 }
 ```
@@ -2300,6 +2323,11 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         }
       ]
     },
+    "features": {
+      "value": {
+        "enableLogAccessUsingOnlyResourcePermissions": true
+      }
+    },
     "gallerySolutions": {
       "value": [
         {
@@ -2361,9 +2389,6 @@ module workspace 'br/public:avm/res/operational-insights/workspace:<version>' =
         "hidden-title": "This is visible in the resource name",
         "Role": "DeploymentValidation"
       }
-    },
-    "useResourcePermissions": {
-      "value": true
     }
   }
 }
@@ -2481,6 +2506,9 @@ param diagnosticSettings = [
     workspaceResourceId: '<workspaceResourceId>'
   }
 ]
+param features = {
+  enableLogAccessUsingOnlyResourcePermissions: true
+}
 param gallerySolutions = [
   {
     name: 'AzureAutomation(oiwwaf001)'
@@ -2525,7 +2553,6 @@ param tags = {
   'hidden-title': 'This is visible in the resource name'
   Role: 'DeploymentValidation'
 }
-param useResourcePermissions = true
 ```
 
 </details>
@@ -2555,6 +2582,7 @@ param useResourcePermissions = true
 | [`dataSources`](#parameter-datasources) | array | LAW data sources to configure. |
 | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. |
 | [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. |
+| [`features`](#parameter-features) | object | The workspace features. |
 | [`forceCmkForQuery`](#parameter-forcecmkforquery) | bool | Indicates whether customer managed storage is mandatory for query management. |
 | [`gallerySolutions`](#parameter-gallerysolutions) | array | List of gallerySolutions to be created in the log analytics workspace. |
 | [`linkedServices`](#parameter-linkedservices) | array | List of services to be linked. |
@@ -2571,7 +2599,6 @@ param useResourcePermissions = true
 | [`storageInsightsConfigs`](#parameter-storageinsightsconfigs) | array | List of storage accounts to be read by the workspace. |
 | [`tables`](#parameter-tables) | array | LAW custom tables to be deployed. |
 | [`tags`](#parameter-tags) | object | Tags of the resource. |
-| [`useResourcePermissions`](#parameter-useresourcepermissions) | bool | Set to 'true' to use resource or workspace permissions and 'false' (or leave empty) to require workspace permissions. |
 
 ### Parameter: `name`
 
@@ -3078,6 +3105,60 @@ Enable/Disable usage telemetry for module.
 - MinValue: 0
 - MaxValue: 730
 
+### Parameter: `features`
+
+The workspace features.
+
+- Required: No
+- Type: object
+- MinValue: 0
+- MaxValue: 730
+
+**Optional parameters**
+
+| Parameter | Type | Description |
+| :-- | :-- | :-- |
+| [`disableLocalAuth`](#parameter-featuresdisablelocalauth) | bool | Disable Non-EntraID based Auth. Default is true. |
+| [`enableDataExport`](#parameter-featuresenabledataexport) | bool | Flag that indicate if data should be exported. |
+| [`enableLogAccessUsingOnlyResourcePermissions`](#parameter-featuresenablelogaccessusingonlyresourcepermissions) | bool | Enable log access using only resource permissions. Default is false. |
+| [`immediatePurgeDataOn30Days`](#parameter-featuresimmediatepurgedataon30days) | bool | Flag that describes if we want to remove the data after 30 days. |
+
+### Parameter: `features.disableLocalAuth`
+
+Disable Non-EntraID based Auth. Default is true.
+
+- Required: No
+- Type: bool
+- MinValue: 0
+- MaxValue: 730
+
+### Parameter: `features.enableDataExport`
+
+Flag that indicate if data should be exported.
+
+- Required: No
+- Type: bool
+- MinValue: 0
+- MaxValue: 730
+
+### Parameter: `features.enableLogAccessUsingOnlyResourcePermissions`
+
+Enable log access using only resource permissions. Default is false.
+
+- Required: No
+- Type: bool
+- MinValue: 0
+- MaxValue: 730
+
+### Parameter: `features.immediatePurgeDataOn30Days`
+
+Flag that describes if we want to remove the data after 30 days.
+
+- Required: No
+- Type: bool
+- MinValue: 0
+- MaxValue: 730
+
 ### Parameter: `forceCmkForQuery`
 
 Indicates whether customer managed storage is mandatory for query management.
@@ -4110,16 +4191,6 @@ Tags of the resource.
 - MinValue: 100
 - MaxValue: 5000
 
-### Parameter: `useResourcePermissions`
-
-Set to 'true' to use resource or workspace permissions and 'false' (or leave empty) to require workspace permissions.
-
-- Required: No
-- Type: bool
-- Default: `False`
-- MinValue: 100
-- MaxValue: 5000
-
 ## Outputs
 
 | Output | Type | Description |
diff --git a/avm/res/operational-insights/workspace/data-export/README.md b/avm/res/operational-insights/workspace/data-export/README.md
index c4bbb39e28..f6438994a9 100644
--- a/avm/res/operational-insights/workspace/data-export/README.md
+++ b/avm/res/operational-insights/workspace/data-export/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Data Export.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/dataExports` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataExports) |
+| `Microsoft.OperationalInsights/workspaces/dataExports` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/dataExports) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/data-export/main.bicep b/avm/res/operational-insights/workspace/data-export/main.bicep
index a1e4649b51..9c0bfa7426 100644
--- a/avm/res/operational-insights/workspace/data-export/main.bicep
+++ b/avm/res/operational-insights/workspace/data-export/main.bicep
@@ -27,11 +27,11 @@ param tableNames string[]
 //   Deployments   //
 // =============== //
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: workspaceName
 }
 
-resource dataExport 'Microsoft.OperationalInsights/workspaces/dataExports@2020-08-01' = {
+resource dataExport 'Microsoft.OperationalInsights/workspaces/dataExports@2023-09-01' = {
   parent: workspace
   name: name
   properties: {
diff --git a/avm/res/operational-insights/workspace/data-export/main.json b/avm/res/operational-insights/workspace/data-export/main.json
index 6b96dce5d9..4b77c88859 100644
--- a/avm/res/operational-insights/workspace/data-export/main.json
+++ b/avm/res/operational-insights/workspace/data-export/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "14977926524140126314"
+      "version": "0.33.93.31351",
+      "templateHash": "15082251740316718256"
     },
     "name": "Log Analytics Workspace Data Exports",
     "description": "This module deploys a Log Analytics Workspace Data Export."
@@ -88,12 +88,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('workspaceName')]"
     },
     "dataExport": {
       "type": "Microsoft.OperationalInsights/workspaces/dataExports",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
       "properties": {
         "destination": "[parameters('destination')]",
diff --git a/avm/res/operational-insights/workspace/data-source/README.md b/avm/res/operational-insights/workspace/data-source/README.md
index 752f4583a9..5236dc5c9b 100644
--- a/avm/res/operational-insights/workspace/data-source/README.md
+++ b/avm/res/operational-insights/workspace/data-source/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Data Source.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/dataSources` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataSources) |
+| `Microsoft.OperationalInsights/workspaces/dataSources` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/dataSources) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/data-source/main.bicep b/avm/res/operational-insights/workspace/data-source/main.bicep
index 138d596782..aa62d35059 100644
--- a/avm/res/operational-insights/workspace/data-source/main.bicep
+++ b/avm/res/operational-insights/workspace/data-source/main.bicep
@@ -56,11 +56,11 @@ param syslogName string?
 @description('Optional. Severities to configure when kind is LinuxSyslog.')
 param syslogSeverities array = []
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: logAnalyticsWorkspaceName
 }
 
-resource dataSource 'Microsoft.OperationalInsights/workspaces/dataSources@2020-08-01' = {
+resource dataSource 'Microsoft.OperationalInsights/workspaces/dataSources@2023-09-01' = {
   name: name
   parent: workspace
   kind: kind
diff --git a/avm/res/operational-insights/workspace/data-source/main.json b/avm/res/operational-insights/workspace/data-source/main.json
index 4f5dd5b680..1a6b16e915 100644
--- a/avm/res/operational-insights/workspace/data-source/main.json
+++ b/avm/res/operational-insights/workspace/data-source/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "12082641043455308513"
+      "version": "0.33.93.31351",
+      "templateHash": "3186325409788999053"
     },
     "name": "Log Analytics Workspace Datasources",
     "description": "This module deploys a Log Analytics Workspace Data Source."
@@ -130,12 +130,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('logAnalyticsWorkspaceName')]"
     },
     "dataSource": {
       "type": "Microsoft.OperationalInsights/workspaces/dataSources",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
       "kind": "[parameters('kind')]",
       "tags": "[parameters('tags')]",
diff --git a/avm/res/operational-insights/workspace/linked-service/README.md b/avm/res/operational-insights/workspace/linked-service/README.md
index bca53b7a24..75c3ecb002 100644
--- a/avm/res/operational-insights/workspace/linked-service/README.md
+++ b/avm/res/operational-insights/workspace/linked-service/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Linked Service.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/linkedServices` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedServices) |
+| `Microsoft.OperationalInsights/workspaces/linkedServices` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/linkedServices) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/linked-service/main.bicep b/avm/res/operational-insights/workspace/linked-service/main.bicep
index 299750ed0a..4d2a2a86b7 100644
--- a/avm/res/operational-insights/workspace/linked-service/main.bicep
+++ b/avm/res/operational-insights/workspace/linked-service/main.bicep
@@ -16,11 +16,11 @@ param writeAccessResourceId string?
 @description('Optional. Tags to configure in the resource.')
 param tags object?
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-08-01' = {
+resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2023-09-01' = {
   name: name
   parent: workspace
   tags: tags
diff --git a/avm/res/operational-insights/workspace/linked-service/main.json b/avm/res/operational-insights/workspace/linked-service/main.json
index a7ece0d812..370cdfc4e9 100644
--- a/avm/res/operational-insights/workspace/linked-service/main.json
+++ b/avm/res/operational-insights/workspace/linked-service/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "17762270878383445421"
+      "version": "0.33.93.31351",
+      "templateHash": "15202444687633091947"
     },
     "name": "Log Analytics Workspace Linked Services",
     "description": "This module deploys a Log Analytics Workspace Linked Service."
@@ -50,12 +50,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('logAnalyticsWorkspaceName')]"
     },
     "linkedService": {
       "type": "Microsoft.OperationalInsights/workspaces/linkedServices",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
       "tags": "[parameters('tags')]",
       "properties": {
diff --git a/avm/res/operational-insights/workspace/linked-storage-account/README.md b/avm/res/operational-insights/workspace/linked-storage-account/README.md
index a4604fdeea..85e4ef7b54 100644
--- a/avm/res/operational-insights/workspace/linked-storage-account/README.md
+++ b/avm/res/operational-insights/workspace/linked-storage-account/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Linked Storage Account.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/linkedStorageAccounts` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedStorageAccounts) |
+| `Microsoft.OperationalInsights/workspaces/linkedStorageAccounts` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/linkedStorageAccounts) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/linked-storage-account/main.bicep b/avm/res/operational-insights/workspace/linked-storage-account/main.bicep
index e77ca26f23..5fc0c473ed 100644
--- a/avm/res/operational-insights/workspace/linked-storage-account/main.bicep
+++ b/avm/res/operational-insights/workspace/linked-storage-account/main.bicep
@@ -17,11 +17,11 @@ param name string
 @description('Required. Linked storage accounts resources Ids.')
 param storageAccountIds string[]
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedStorageAccount 'Microsoft.OperationalInsights/workspaces/linkedStorageAccounts@2020-08-01' = {
+resource linkedStorageAccount 'Microsoft.OperationalInsights/workspaces/linkedStorageAccounts@2023-09-01' = {
   name: name
   parent: workspace
   properties: {
diff --git a/avm/res/operational-insights/workspace/linked-storage-account/main.json b/avm/res/operational-insights/workspace/linked-storage-account/main.json
index 9ee99f5c48..603f7b3d2a 100644
--- a/avm/res/operational-insights/workspace/linked-storage-account/main.json
+++ b/avm/res/operational-insights/workspace/linked-storage-account/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "11986582912298301528"
+      "version": "0.33.93.31351",
+      "templateHash": "1489251440210164837"
     },
     "name": "Log Analytics Workspace Linked Storage Accounts",
     "description": "This module deploys a Log Analytics Workspace Linked Storage Account."
@@ -45,12 +45,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('logAnalyticsWorkspaceName')]"
     },
     "linkedStorageAccount": {
       "type": "Microsoft.OperationalInsights/workspaces/linkedStorageAccounts",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
       "properties": {
         "storageAccountIds": "[parameters('storageAccountIds')]"
diff --git a/avm/res/operational-insights/workspace/main.bicep b/avm/res/operational-insights/workspace/main.bicep
index edc8a326d2..d5b2e65c13 100644
--- a/avm/res/operational-insights/workspace/main.bicep
+++ b/avm/res/operational-insights/workspace/main.bicep
@@ -79,8 +79,8 @@ import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types
 @description('Optional. The managed identity definition for this resource. Only one type of identity is supported: system-assigned or user-assigned, but not both.')
 param managedIdentities managedIdentityAllType?
 
-@description('Optional. Set to \'true\' to use resource or workspace permissions and \'false\' (or leave empty) to require workspace permissions.')
-param useResourcePermissions bool = false
+@description('Optional. The workspace features.')
+param features workspaceFeaturesType?
 
 @description('Optional. The diagnostic settings of the service.')
 param diagnosticSettings diagnosticSettingType[]?
@@ -185,14 +185,17 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableT
   }
 }
 
-resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = {
+resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = {
   location: location
   name: name
   tags: tags
   properties: {
     features: {
       searchVersion: 1
-      enableLogAccessUsingOnlyResourcePermissions: useResourcePermissions
+      enableLogAccessUsingOnlyResourcePermissions: features.?enableLogAccessUsingOnlyResourcePermissions ?? false
+      disableLocalAuth: features.?disableLocalAuth ?? true
+      enableDataExport: features.?enableDataExport
+      immediatePurgeDataOn30Days: features.?immediatePurgeDataOn30Days
     }
     sku: {
       name: skuName
@@ -648,3 +651,19 @@ type tableType = {
   @description('Optional. The role assignments for the table.')
   roleAssignments: roleAssignmentType[]?
 }
+
+@export()
+@description('Features of the workspace.')
+type workspaceFeaturesType = {
+  @description('Optional. Disable Non-EntraID based Auth. Default is true.')
+  disableLocalAuth: bool?
+
+  @description('Optional. Flag that indicate if data should be exported.')
+  enableDataExport: bool?
+
+  @description('Optional. Enable log access using only resource permissions. Default is false.')
+  enableLogAccessUsingOnlyResourcePermissions: bool?
+
+  @description('Optional. Flag that describes if we want to remove the data after 30 days.')
+  immediatePurgeDataOn30Days: bool?
+}
diff --git a/avm/res/operational-insights/workspace/main.json b/avm/res/operational-insights/workspace/main.json
index 1c6da556b6..4debca7e83 100644
--- a/avm/res/operational-insights/workspace/main.json
+++ b/avm/res/operational-insights/workspace/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.13.18514",
-      "templateHash": "4169914284504175169"
+      "version": "0.33.93.31351",
+      "templateHash": "2355986442928910370"
     },
     "name": "Log Analytics Workspaces",
     "description": "This module deploys a Log Analytics Workspace."
@@ -523,6 +523,43 @@
         "description": "Properties of the custom table."
       }
     },
+    "workspaceFeaturesType": {
+      "type": "object",
+      "properties": {
+        "disableLocalAuth": {
+          "type": "bool",
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Disable Non-EntraID based Auth. Default is true."
+          }
+        },
+        "enableDataExport": {
+          "type": "bool",
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Flag that indicate if data should be exported."
+          }
+        },
+        "enableLogAccessUsingOnlyResourcePermissions": {
+          "type": "bool",
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Enable log access using only resource permissions. Default is false."
+          }
+        },
+        "immediatePurgeDataOn30Days": {
+          "type": "bool",
+          "nullable": true,
+          "metadata": {
+            "description": "Optional. Flag that describes if we want to remove the data after 30 days."
+          }
+        }
+      },
+      "metadata": {
+        "__bicep_export!": true,
+        "description": "Features of the workspace."
+      }
+    },
     "_1.columnType": {
       "type": "object",
       "properties": {
@@ -1070,11 +1107,11 @@
         "description": "Optional. The managed identity definition for this resource. Only one type of identity is supported: system-assigned or user-assigned, but not both."
       }
     },
-    "useResourcePermissions": {
-      "type": "bool",
-      "defaultValue": false,
+    "features": {
+      "$ref": "#/definitions/workspaceFeaturesType",
+      "nullable": true,
       "metadata": {
-        "description": "Optional. Set to 'true' to use resource or workspace permissions and 'false' (or leave empty) to require workspace permissions."
+        "description": "Optional. The workspace features."
       }
     },
     "diagnosticSettings": {
@@ -1173,14 +1210,17 @@
     },
     "logAnalyticsWorkspace": {
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('name')]",
       "location": "[parameters('location')]",
       "tags": "[parameters('tags')]",
       "properties": {
         "features": {
           "searchVersion": 1,
-          "enableLogAccessUsingOnlyResourcePermissions": "[parameters('useResourcePermissions')]"
+          "enableLogAccessUsingOnlyResourcePermissions": "[coalesce(tryGet(parameters('features'), 'enableLogAccessUsingOnlyResourcePermissions'), false())]",
+          "disableLocalAuth": "[coalesce(tryGet(parameters('features'), 'disableLocalAuth'), true())]",
+          "enableDataExport": "[tryGet(parameters('features'), 'enableDataExport')]",
+          "immediatePurgeDataOn30Days": "[tryGet(parameters('features'), 'immediatePurgeDataOn30Days')]"
         },
         "sku": {
           "name": "[parameters('skuName')]",
@@ -1318,8 +1358,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "12715459455039038966"
+              "version": "0.33.93.31351",
+              "templateHash": "14024094214852981332"
             },
             "name": "Log Analytics Workspace Storage Insight Configs",
             "description": "This module deploys a Log Analytics Workspace Storage Insight Config."
@@ -1382,12 +1422,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('logAnalyticsWorkspaceName')]"
             },
             "storageinsightconfig": {
               "type": "Microsoft.OperationalInsights/workspaces/storageInsightConfigs",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
               "tags": "[parameters('tags')]",
               "properties": {
@@ -1463,8 +1503,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "17369295448584741847"
+              "version": "0.33.93.31351",
+              "templateHash": "15202444687633091947"
             },
             "name": "Log Analytics Workspace Linked Services",
             "description": "This module deploys a Log Analytics Workspace Linked Service."
@@ -1508,12 +1548,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('logAnalyticsWorkspaceName')]"
             },
             "linkedService": {
               "type": "Microsoft.OperationalInsights/workspaces/linkedServices",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
               "tags": "[parameters('tags')]",
               "properties": {
@@ -1582,8 +1622,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "4336014228195179628"
+              "version": "0.33.93.31351",
+              "templateHash": "1489251440210164837"
             },
             "name": "Log Analytics Workspace Linked Storage Accounts",
             "description": "This module deploys a Log Analytics Workspace Linked Storage Account."
@@ -1622,12 +1662,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('logAnalyticsWorkspaceName')]"
             },
             "linkedStorageAccount": {
               "type": "Microsoft.OperationalInsights/workspaces/linkedStorageAccounts",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
               "properties": {
                 "storageAccountIds": "[parameters('storageAccountIds')]"
@@ -1715,8 +1755,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "10687105232425640835"
+              "version": "0.33.93.31351",
+              "templateHash": "14407663387414945082"
             },
             "name": "Log Analytics Workspace Saved Searches",
             "description": "This module deploys a Log Analytics Workspace Saved Search."
@@ -1792,12 +1832,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('logAnalyticsWorkspaceName')]"
             },
             "savedSearch": {
               "type": "Microsoft.OperationalInsights/workspaces/savedSearches",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
               "properties": {
                 "etag": "[parameters('etag')]",
@@ -1878,8 +1918,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "9265911316713795008"
+              "version": "0.33.93.31351",
+              "templateHash": "15082251740316718256"
             },
             "name": "Log Analytics Workspace Data Exports",
             "description": "This module deploys a Log Analytics Workspace Data Export."
@@ -1961,12 +2001,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('workspaceName')]"
             },
             "dataExport": {
               "type": "Microsoft.OperationalInsights/workspaces/dataExports",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
               "properties": {
                 "destination": "[parameters('destination')]",
@@ -2071,8 +2111,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "16545899498885737893"
+              "version": "0.33.93.31351",
+              "templateHash": "3186325409788999053"
             },
             "name": "Log Analytics Workspace Datasources",
             "description": "This module deploys a Log Analytics Workspace Data Source."
@@ -2196,12 +2236,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('logAnalyticsWorkspaceName')]"
             },
             "dataSource": {
               "type": "Microsoft.OperationalInsights/workspaces/dataSources",
-              "apiVersion": "2020-08-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
               "kind": "[parameters('kind')]",
               "tags": "[parameters('tags')]",
@@ -2298,8 +2338,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "9728326644814973167"
+              "version": "0.33.93.31351",
+              "templateHash": "4329017759962267155"
             },
             "name": "Log Analytics Workspace Tables",
             "description": "This module deploys a Log Analytics Workspace Table."
@@ -2648,12 +2688,12 @@
             "workspace": {
               "existing": true,
               "type": "Microsoft.OperationalInsights/workspaces",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[parameters('workspaceName')]"
             },
             "table": {
               "type": "Microsoft.OperationalInsights/workspaces/tables",
-              "apiVersion": "2022-10-01",
+              "apiVersion": "2023-09-01",
               "name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
               "properties": {
                 "plan": "[parameters('plan')]",
@@ -2942,7 +2982,7 @@
       "metadata": {
         "description": "The location the resource was deployed into."
       },
-      "value": "[reference('logAnalyticsWorkspace', '2022-10-01', 'full').location]"
+      "value": "[reference('logAnalyticsWorkspace', '2023-09-01', 'full').location]"
     },
     "systemAssignedMIPrincipalId": {
       "type": "string",
@@ -2950,7 +2990,7 @@
       "metadata": {
         "description": "The principal ID of the system assigned identity."
       },
-      "value": "[tryGet(tryGet(reference('logAnalyticsWorkspace', '2022-10-01', 'full'), 'identity'), 'principalId')]"
+      "value": "[tryGet(tryGet(reference('logAnalyticsWorkspace', '2023-09-01', 'full'), 'identity'), 'principalId')]"
     }
   }
 }
\ No newline at end of file
diff --git a/avm/res/operational-insights/workspace/saved-search/README.md b/avm/res/operational-insights/workspace/saved-search/README.md
index dfd853b645..697d8e95b1 100644
--- a/avm/res/operational-insights/workspace/saved-search/README.md
+++ b/avm/res/operational-insights/workspace/saved-search/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Saved Search.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/savedSearches` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/savedSearches) |
+| `Microsoft.OperationalInsights/workspaces/savedSearches` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/savedSearches) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/saved-search/main.bicep b/avm/res/operational-insights/workspace/saved-search/main.bicep
index e0b9512ed2..00a2de1f29 100644
--- a/avm/res/operational-insights/workspace/saved-search/main.bicep
+++ b/avm/res/operational-insights/workspace/saved-search/main.bicep
@@ -31,11 +31,11 @@ param version int?
 @description('Optional. The ETag of the saved search. To override an existing saved search, use "*" or specify the current Etag.')
 param etag string = '*'
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: logAnalyticsWorkspaceName
 }
 
-resource savedSearch 'Microsoft.OperationalInsights/workspaces/savedSearches@2020-08-01' = {
+resource savedSearch 'Microsoft.OperationalInsights/workspaces/savedSearches@2023-09-01' = {
   name: name
   parent: workspace
   //etag: etag // According to API, the variable should be here, but it doesn't work here.
diff --git a/avm/res/operational-insights/workspace/saved-search/main.json b/avm/res/operational-insights/workspace/saved-search/main.json
index 34553f9fe9..8d1d1cae6c 100644
--- a/avm/res/operational-insights/workspace/saved-search/main.json
+++ b/avm/res/operational-insights/workspace/saved-search/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "9640551980154944642"
+      "version": "0.33.93.31351",
+      "templateHash": "14407663387414945082"
     },
     "name": "Log Analytics Workspace Saved Searches",
     "description": "This module deploys a Log Analytics Workspace Saved Search."
@@ -82,12 +82,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('logAnalyticsWorkspaceName')]"
     },
     "savedSearch": {
       "type": "Microsoft.OperationalInsights/workspaces/savedSearches",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
       "properties": {
         "etag": "[parameters('etag')]",
diff --git a/avm/res/operational-insights/workspace/storage-insight-config/README.md b/avm/res/operational-insights/workspace/storage-insight-config/README.md
index 8bd800b2d2..34afc44426 100644
--- a/avm/res/operational-insights/workspace/storage-insight-config/README.md
+++ b/avm/res/operational-insights/workspace/storage-insight-config/README.md
@@ -12,7 +12,7 @@ This module deploys a Log Analytics Workspace Storage Insight Config.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.OperationalInsights/workspaces/storageInsightConfigs` | [2020-08-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/storageInsightConfigs) |
+| `Microsoft.OperationalInsights/workspaces/storageInsightConfigs` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/storageInsightConfigs) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/storage-insight-config/main.bicep b/avm/res/operational-insights/workspace/storage-insight-config/main.bicep
index 4ec9de9a68..8cb9aabb2d 100644
--- a/avm/res/operational-insights/workspace/storage-insight-config/main.bicep
+++ b/avm/res/operational-insights/workspace/storage-insight-config/main.bicep
@@ -23,11 +23,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' existing
   name: last(split(storageAccountResourceId, '/'))!
 }
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: logAnalyticsWorkspaceName
 }
 
-resource storageinsightconfig 'Microsoft.OperationalInsights/workspaces/storageInsightConfigs@2020-08-01' = {
+resource storageinsightconfig 'Microsoft.OperationalInsights/workspaces/storageInsightConfigs@2023-09-01' = {
   name: name
   parent: workspace
   tags: tags
diff --git a/avm/res/operational-insights/workspace/storage-insight-config/main.json b/avm/res/operational-insights/workspace/storage-insight-config/main.json
index 15f3aed89c..e80b09bf6b 100644
--- a/avm/res/operational-insights/workspace/storage-insight-config/main.json
+++ b/avm/res/operational-insights/workspace/storage-insight-config/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "12148501849006788324"
+      "version": "0.33.93.31351",
+      "templateHash": "14024094214852981332"
     },
     "name": "Log Analytics Workspace Storage Insight Configs",
     "description": "This module deploys a Log Analytics Workspace Storage Insight Config."
@@ -69,12 +69,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('logAnalyticsWorkspaceName')]"
     },
     "storageinsightconfig": {
       "type": "Microsoft.OperationalInsights/workspaces/storageInsightConfigs",
-      "apiVersion": "2020-08-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('logAnalyticsWorkspaceName'), parameters('name'))]",
       "tags": "[parameters('tags')]",
       "properties": {
diff --git a/avm/res/operational-insights/workspace/table/README.md b/avm/res/operational-insights/workspace/table/README.md
index c3cbc41a4c..32a0f782c8 100644
--- a/avm/res/operational-insights/workspace/table/README.md
+++ b/avm/res/operational-insights/workspace/table/README.md
@@ -14,7 +14,7 @@ This module deploys a Log Analytics Workspace Table.
 | Resource Type | API Version |
 | :-- | :-- |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
-| `Microsoft.OperationalInsights/workspaces/tables` | [2022-10-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2022-10-01/workspaces/tables) |
+| `Microsoft.OperationalInsights/workspaces/tables` | [2023-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2023-09-01/workspaces/tables) |
 
 ## Parameters
 
diff --git a/avm/res/operational-insights/workspace/table/main.bicep b/avm/res/operational-insights/workspace/table/main.bicep
index ed15f51109..a886ffc8f3 100644
--- a/avm/res/operational-insights/workspace/table/main.bicep
+++ b/avm/res/operational-insights/workspace/table/main.bicep
@@ -86,11 +86,11 @@ var formattedRoleAssignments = [
 //   Deployments   //
 // =============== //
 
-resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = {
+resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
   name: workspaceName
 }
 
-resource table 'Microsoft.OperationalInsights/workspaces/tables@2022-10-01' = {
+resource table 'Microsoft.OperationalInsights/workspaces/tables@2023-09-01' = {
   parent: workspace
   name: name
   properties: {
diff --git a/avm/res/operational-insights/workspace/table/main.json b/avm/res/operational-insights/workspace/table/main.json
index fa7999f6b9..fdf48788fd 100644
--- a/avm/res/operational-insights/workspace/table/main.json
+++ b/avm/res/operational-insights/workspace/table/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "8047367069034259642"
+      "version": "0.33.93.31351",
+      "templateHash": "4329017759962267155"
     },
     "name": "Log Analytics Workspace Tables",
     "description": "This module deploys a Log Analytics Workspace Table."
@@ -355,12 +355,12 @@
     "workspace": {
       "existing": true,
       "type": "Microsoft.OperationalInsights/workspaces",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('workspaceName')]"
     },
     "table": {
       "type": "Microsoft.OperationalInsights/workspaces/tables",
-      "apiVersion": "2022-10-01",
+      "apiVersion": "2023-09-01",
       "name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
       "properties": {
         "plan": "[parameters('plan')]",
diff --git a/avm/res/operational-insights/workspace/tests/e2e/adv/main.test.bicep b/avm/res/operational-insights/workspace/tests/e2e/adv/main.test.bicep
index 3a052d4bae..b16ae0b3b5 100644
--- a/avm/res/operational-insights/workspace/tests/e2e/adv/main.test.bicep
+++ b/avm/res/operational-insights/workspace/tests/e2e/adv/main.test.bicep
@@ -227,7 +227,9 @@ module testDeployment '../../../main.bicep' = [
           ]
         }
       ]
-      useResourcePermissions: true
+      features: {
+        enableLogAccessUsingOnlyResourcePermissions: true
+      }
       tables: [
         {
           name: 'CustomTableBasic_CL'
diff --git a/avm/res/operational-insights/workspace/tests/e2e/max/main.test.bicep b/avm/res/operational-insights/workspace/tests/e2e/max/main.test.bicep
index 9b069e5ef2..e8f0c15a3e 100644
--- a/avm/res/operational-insights/workspace/tests/e2e/max/main.test.bicep
+++ b/avm/res/operational-insights/workspace/tests/e2e/max/main.test.bicep
@@ -173,6 +173,12 @@ module testDeployment '../../../main.bicep' = [
           workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
         }
       ]
+      features: {
+        enableLogAccessUsingOnlyResourcePermissions: true
+        disableLocalAuth: true
+        enableDataExport: true
+        immediatePurgeDataOn30Days: true
+      }
       gallerySolutions: [
         {
           name: 'AzureAutomation(${namePrefix}${serviceShort}001)'
@@ -338,7 +344,6 @@ module testDeployment '../../../main.bicep' = [
           ]
         }
       ]
-      useResourcePermissions: true
       tags: {
         'hidden-title': 'This is visible in the resource name'
         Environment: 'Non-Prod'
@@ -370,9 +375,5 @@ module testDeployment '../../../main.bicep' = [
         }
       ]
     }
-    dependsOn: [
-      nestedDependencies
-      diagnosticDependencies
-    ]
   }
 ]
diff --git a/avm/res/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep b/avm/res/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep
index cf61ff31a9..5fa264c253 100644
--- a/avm/res/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/res/operational-insights/workspace/tests/e2e/waf-aligned/main.test.bicep
@@ -201,7 +201,9 @@ module testDeployment '../../../main.bicep' = [
           ]
         }
       ]
-      useResourcePermissions: true
+      features: {
+        enableLogAccessUsingOnlyResourcePermissions: true
+      }
       tags: {
         'hidden-title': 'This is visible in the resource name'
         Environment: 'Non-Prod'
@@ -211,9 +213,5 @@ module testDeployment '../../../main.bicep' = [
         systemAssigned: true
       }
     }
-    dependsOn: [
-      nestedDependencies
-      diagnosticDependencies
-    ]
   }
 ]
diff --git a/avm/res/operational-insights/workspace/version.json b/avm/res/operational-insights/workspace/version.json
index a830c3d961..91ffa760bf 100644
--- a/avm/res/operational-insights/workspace/version.json
+++ b/avm/res/operational-insights/workspace/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://aka.ms/bicep-registry-module-version-file-schema#",
-  "version": "0.10",
+  "version": "0.11",
   "pathFilters": [
     "./main.json"
   ]