diff --git a/pom.xml b/pom.xml
index 1a6aadab7..afcb2aaba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <!--  weblogic azure aks versions  -->
         <version.wls-on-aks-azure-marketplace>1.0.87</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
-        <version.arm-oraclelinux-wls>1.0.30</version.arm-oraclelinux-wls>
+        <version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
         <version.arm-oraclelinux-wls-admin>1.0.55</version.arm-oraclelinux-wls-admin>
         <version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
         <version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
diff --git a/resources/azure-common.properties b/resources/azure-common.properties
index 8648bea76..dcbfae78e 100644
--- a/resources/azure-common.properties
+++ b/resources/azure-common.properties
@@ -39,9 +39,9 @@ azure.apiVersionForDeployment=2023-07-01
 # Microsoft.Resources/tags
 azure.apiVersionForTags=2023-07-01
 # Microsoft.Storage/storageAccounts
-azure.apiVersionForStorage=2023-01-01
+azure.apiVersionForStorage=2023-05-01
 # Microsoft.Storage/storageAccounts/fileServices
-azure.apiVersionForStorageFileService=2023-01-01
+azure.apiVersionForStorageFileService=2023-05-01
 # Microsoft.Monitor/accounts
 azure.apiVersionForMonitorAccount=2023-04-03
 
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json
index c9e46e4be..a264d21d9 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json
@@ -112,6 +112,7 @@
    },
    "variables": {
       "const_addressPrefix": "10.0.0.0/16",
+      "const_globalResourceNameSuffix": "[uniqueString(parameters('guidValue'))]",
       "const_hyphen": "-",
       "const_imageOffer": "[concat('weblogic',variables('const_hyphen'), split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[1],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[2],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[3],if(parameters('usePreviewImage'),'-preview',''))]",
       "const_imagePublisher": "oracle",
@@ -133,12 +134,13 @@
       "const_vmSize": "[parameters('vmSize')]",
       "name_linuxImageOfferSKU": "[first(split(parameters('skuUrnVersion'), ';'))]",
       "name_linuxImageVersion": "[last(split(parameters('skuUrnVersion'),';'))]",
-      "name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]",
-      "name_nic": "olvm_NIC",
-      "name_publicIPAddress": "olvm_PublicIP",
-      "name_storageAccount": "[concat(take(replace(parameters('guidValue'),'-',''),6),'olvm')]",
+      "name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg_', variables('const_globalResourceNameSuffix'))]",
+      "name_nic": "[concat('olvm_NIC_', variables('const_globalResourceNameSuffix'))]",
+      "name_publicIPAddress": "[concat('olvm_PublicIP_', variables('const_globalResourceNameSuffix'))]",
+      "name_storageAccount": "[concat('olvmstg', variables('const_globalResourceNameSuffix'))]",
       "name_subnet": "Subnet",
-      "name_virtualNetwork": "olvm_VNET",
+      "name_virtualNetwork": "[concat('olvm_VNET_', variables('const_globalResourceNameSuffix'))]",
+      "name_vmName": "[concat(parameters('vmName'), variables('const_globalResourceNameSuffix'))]",
       "ref_networkSecurityGroup": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('name_networkSecurityGroup'))]",
       "ref_subnet": "[resourceId('Microsoft.Network/virtualNetworks/subnets', variables('name_virtualNetwork'), variables('name_subnet'))]"
    },
@@ -285,7 +287,7 @@
                }
             ],
             "dnsSettings": {
-               "internalDnsNameLabel": "[parameters('vmName')]"
+               "internalDnsNameLabel": "[variables('name_vmName')]"
             }
          }
       },
@@ -293,7 +295,7 @@
          "apiVersion": "${azure.apiVersionForVirtualMachines}",
          "type": "Microsoft.Compute/virtualMachines",
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]",
-         "name": "[parameters('vmName')]",
+         "name": "[variables('name_vmName')]",
          "location": "[parameters('location')]",
          "dependsOn": [
             "[resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount'))]",
@@ -305,7 +307,7 @@
                "vmSize": "[variables('const_vmSize')]"
             },
             "osProfile": {
-               "computerName": "[parameters('vmName')]",
+               "computerName": "[variables('name_vmName')]",
                "adminUsername": "[parameters('adminUsername')]",
                "adminPassword": "[parameters('adminPasswordOrKey')]",
                "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('const_linuxConfiguration'))]"
@@ -350,7 +352,7 @@
          "type": "Microsoft.Resources/deployments",
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -368,7 +370,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -387,7 +389,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -406,7 +408,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -425,7 +427,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -444,7 +446,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -463,7 +465,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -482,7 +484,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -501,7 +503,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -520,7 +522,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -539,7 +541,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -558,7 +560,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -577,7 +579,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -596,7 +598,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -615,7 +617,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",
@@ -634,7 +636,7 @@
          "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
          "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
          "dependsOn": [
-            "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
          ],
          "properties": {
             "mode": "Incremental",