diff --git a/samples/custom-connector-bicep/connector-verify.bicep b/samples/custom-connector-bicep/connector-verify.bicep
index a3a5a56a..1e7a439f 100644
--- a/samples/custom-connector-bicep/connector-verify.bicep
+++ b/samples/custom-connector-bicep/connector-verify.bicep
@@ -32,15 +32,15 @@ resource aioExtension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01'
   scope: connectedCluster
 }
 
-resource aioInstance 'Microsoft.IoTOperations/instances@2025-04-01' existing = {
+resource aioInstance 'Microsoft.IoTOperations/instances@2026-07-01' existing = {
   name: aioInstanceName
 }
 
-resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2025-04-01' existing = {
+resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-07-01' existing = {
   name: defaultDataflowEndpointName
 }
 
-resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2025-04-01' existing = {
+resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2026-07-01' existing = {
   name: defaultDataflowProfileName
   parent: aioInstance
 }
@@ -88,7 +88,7 @@ resource eventHub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = {
 /*                                    Data flow                              */
 /*****************************************************************************/
 
-resource dataflowEndpointEventHub 'Microsoft.IoTOperations/instances/dataflowEndpoints@2025-04-01' = {
+resource dataflowEndpointEventHub 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-07-01' = {
   parent: aioInstance
   name: 'thermostat-eh-endpoint'
   extendedLocation: {
@@ -119,7 +119,7 @@ resource dataflowEndpointEventHub 'Microsoft.IoTOperations/instances/dataflowEnd
   ]
 }
 
-resource dataflowThermostat 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2025-04-01' = {
+resource dataflowThermostat 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-07-01' = {
   parent: defaultDataflowProfile
   name: 'thermostat-data-flow'
   extendedLocation: {
diff --git a/samples/process-control/boiler-simulation.bicep b/samples/process-control/boiler-simulation.bicep
index 65e9a6e1..40934e87 100644
--- a/samples/process-control/boiler-simulation.bicep
+++ b/samples/process-control/boiler-simulation.bicep
@@ -15,7 +15,7 @@ resource customLocation 'Microsoft.ExtendedLocation/customLocations@2021-08-31-p
   name: customLocationName
 }
 
-resource namespace 'Microsoft.DeviceRegistry/namespaces@2025-07-01-preview' existing = {
+resource namespace 'Microsoft.DeviceRegistry/namespaces@2026-04-01' existing = {
   name: aioNamespaceName
 }
 
@@ -26,7 +26,7 @@ resource namespace 'Microsoft.DeviceRegistry/namespaces@2025-07-01-preview' exis
 var assetName = 'boiler'
 var opcUaEndpointName = 'opc-ua-commander-0'
 
-resource device 'Microsoft.DeviceRegistry/namespaces/devices@2025-07-01-preview' = {
+resource device 'Microsoft.DeviceRegistry/namespaces/devices@2026-04-01' = {
   name: 'opc-ua-commander'
   parent: namespace
   location: resourceGroup().location
@@ -52,7 +52,7 @@ resource device 'Microsoft.DeviceRegistry/namespaces/devices@2025-07-01-preview'
   }
 }
 
-resource asset 'Microsoft.DeviceRegistry/namespaces/assets@2025-07-01-preview' = {
+resource asset 'Microsoft.DeviceRegistry/namespaces/assets@2026-04-01' = {
   name: assetName
   parent: namespace
   location: resourceGroup().location
diff --git a/samples/quickstarts/dataflow.bicep b/samples/quickstarts/dataflow.bicep
index 2370d45c..49350f93 100644
--- a/samples/quickstarts/dataflow.bicep
+++ b/samples/quickstarts/dataflow.bicep
@@ -115,25 +115,25 @@ resource customLocation 'Microsoft.ExtendedLocation/customLocations@2021-08-31-p
   name: customLocationName
 }
 
-resource aioInstance 'Microsoft.IoTOperations/instances@2024-08-15-preview' existing = {
+resource aioInstance 'Microsoft.IoTOperations/instances@2026-03-01' existing = {
   name: aioInstanceName
 }
 
-resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' existing = {
+resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' existing = {
   parent: aioInstance
   name: defaultDataflowEndpointName
 }
 
-resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2024-08-15-preview' existing = {
+resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2026-03-01' existing = {
   parent: aioInstance
   name: defaultDataflowProfileName
 }
 
-resource schemaRegistry 'Microsoft.DeviceRegistry/schemaRegistries@2024-09-01-preview' existing = {
+resource schemaRegistry 'Microsoft.DeviceRegistry/schemaRegistries@2026-04-01' existing = {
   name: schemaRegistryName
 }
 
-resource opcSchema 'Microsoft.DeviceRegistry/schemaRegistries/schemas@2024-09-01-preview' = {
+resource opcSchema 'Microsoft.DeviceRegistry/schemaRegistries/schemas@2026-04-01' = {
   parent: schemaRegistry
   name: opcuaSchemaName
   properties: {
@@ -144,7 +144,7 @@ resource opcSchema 'Microsoft.DeviceRegistry/schemaRegistries/schemas@2024-09-01
   }
 }
 
-resource opcuaSchemaInstance 'Microsoft.DeviceRegistry/schemaRegistries/schemas/schemaVersions@2024-09-01-preview' = {
+resource opcuaSchemaInstance 'Microsoft.DeviceRegistry/schemaRegistries/schemas/schemaVersions@2026-04-01' = {
   parent: opcSchema
   name: opcuaSchemaVer
   properties: {
@@ -154,7 +154,7 @@ resource opcuaSchemaInstance 'Microsoft.DeviceRegistry/schemaRegistries/schemas/
 }
 
 // ADX Endpoint
-resource adxEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource adxEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'adx-ep'
   extendedLocation: {
@@ -179,7 +179,7 @@ resource adxEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-0
 }
 
 // ADX dataflow
-resource dataflow_adx 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_adx 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'dataflow-adx'
   extendedLocation: {
@@ -221,7 +221,7 @@ resource dataflow_adx 'Microsoft.IoTOperations/instances/dataflowProfiles/datafl
 }
 
 // OneLake Endpoint
-resource oneLakeEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource oneLakeEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'onelake-ep'
   extendedLocation: {
@@ -250,7 +250,7 @@ resource oneLakeEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@20
 }
 
 // OneLake dataflow
-resource dataflow_onelake 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_onelake 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'dataflow-onelake3'
   extendedLocation: {
@@ -292,7 +292,7 @@ resource dataflow_onelake 'Microsoft.IoTOperations/instances/dataflowProfiles/da
 }
 
 // ADLS Gen2 Endpoint
-resource adlsGen2Endpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource adlsGen2Endpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'adls-gen2-ep'
   extendedLocation: {
@@ -316,7 +316,7 @@ resource adlsGen2Endpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2
 }
 
 // ADLS dataflow
-resource dataflow_adls 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_adls 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'dataflow-adls'
   extendedLocation: {
@@ -374,7 +374,7 @@ spec:
   storageClassName: unbacked-sc
 */
 
-resource localStorageDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource localStorageDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'local-storage-ep'
   extendedLocation: {
@@ -390,7 +390,7 @@ resource localStorageDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflo
 }
 
 // Local storage dataflow
-resource dataflow_localstor 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_localstor 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'dataflow-localstor'
   extendedLocation: {
@@ -432,7 +432,7 @@ resource dataflow_localstor 'Microsoft.IoTOperations/instances/dataflowProfiles/
 }
 
 // MQ Endpoint
-resource MqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource MqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'aiomq'
   extendedLocation: {
@@ -458,7 +458,7 @@ resource MqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowE
 }
 
 // EventGrid Endpoint
-resource remoteMqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource remoteMqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'eventgrid'
   extendedLocation: {
@@ -481,7 +481,7 @@ resource remoteMqttBrokerDataflowEndpoint 'Microsoft.IoTOperations/instances/dat
 }
 
 // Dataflow for local to remote
-resource dataflow_1 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_1 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'local-to-remote'
   extendedLocation: {
@@ -510,7 +510,7 @@ resource dataflow_1 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflow
 } 
 
 // Dataflow for remote to local
-resource dataflow_2 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource dataflow_2 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'remote-to-local'
   extendedLocation: {
@@ -539,7 +539,7 @@ resource dataflow_2 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflow
 }
 
 // EventHub Endpoint
-resource kafkaEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024-08-15-preview' = {
+resource kafkaEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-03-01' = {
   parent: aioInstance
   name: 'eventhubs'
   extendedLocation: {
@@ -571,7 +571,7 @@ resource kafkaEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2024
 }
 
 // Kafka Dataflow
-resource kafka_dataflow 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2024-08-15-preview' = {
+resource kafka_dataflow 'Microsoft.IoTOperations/instances/dataflowProfiles/dataflows@2026-03-01' = {
   parent: defaultDataflowProfile
   name: 'local-to-eventhub'
   extendedLocation: {
diff --git a/samples/quickstarts/quickstart.bicep b/samples/quickstarts/quickstart.bicep
index 59834957..0c8a8a8d 100644
--- a/samples/quickstarts/quickstart.bicep
+++ b/samples/quickstarts/quickstart.bicep
@@ -8,7 +8,7 @@ param clusterName string
 param customLocationName string
 param aioExtensionName string
 param aioInstanceName string
-param aioNamespaceName string
+param adrNamespaceName string
 param resourceSuffix string = substring(uniqueString(subscription().id, resourceGroup().id, clusterName), 0, 10)
 param eventHubName string = 'aio-eh-${resourceSuffix}'
 param defaultDataflowEndpointName string = 'default'
@@ -32,21 +32,21 @@ resource aioExtension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01'
   scope: connectedCluster
 }
 
-resource aioInstance 'Microsoft.IoTOperations/instances@2025-04-01' existing = {
+resource aioInstance 'Microsoft.IoTOperations/instances@2026-07-01' existing = {
   name: aioInstanceName
 }
 
-resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2025-04-01' existing = {
+resource defaultDataflowEndpoint 'Microsoft.IoTOperations/instances/dataflowEndpoints@2026-07-01' existing = {
   name: defaultDataflowEndpointName
 }
 
-resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2025-04-01' existing = {
+resource defaultDataflowProfile 'Microsoft.IoTOperations/instances/dataflowProfiles@2026-07-01' existing = {
   name: defaultDataflowProfileName
   parent: aioInstance
 }
 
-resource namespace 'Microsoft.DeviceRegistry/namespaces@2026-04-01' existing = {
-  name: aioNamespaceName
+resource adrNamespace 'Microsoft.DeviceRegistry/namespaces@2026-04-01' existing = {
+  name: adrNamespaceName
 }
 
 /*****************************************************************************/
@@ -59,7 +59,7 @@ var deviceName = 'opc-ua-connector'
 
 resource device 'Microsoft.DeviceRegistry/namespaces/devices@2026-04-01' = {
   name: deviceName
-  parent: namespace
+  parent: adrNamespace
   location: resourceGroup().location
   extendedLocation: {
     type: 'CustomLocation'
@@ -86,7 +86,7 @@ resource device 'Microsoft.DeviceRegistry/namespaces/devices@2026-04-01' = {
 
 resource asset 'Microsoft.DeviceRegistry/namespaces/assets@2026-04-01' = {
   name: assetName
-  parent: namespace
+  parent: adrNamespace
   location: resourceGroup().location
   extendedLocation: {
     type: 'CustomLocation'
@@ -232,7 +232,7 @@ resource dataflowCToF 'Microsoft.IoTOperations/instances/dataflowProfiles/datafl
         operationType: 'Source'
         sourceSettings: {
           endpointRef: defaultDataflowEndpoint.name
-          assetRef: '${namespace.name}/${asset.name}'
+          assetRef: '${adrNamespace.name}/${asset.name}'
           serializationFormat: 'Json'
           dataSources: ['azure-iot-operations/data/${asset.name}']
         }