diff --git a/aws/arcgis-enterprise-k8s/organization/variables.tf b/aws/arcgis-enterprise-k8s/organization/variables.tf
index 841869b..85b3f3a 100644
--- a/aws/arcgis-enterprise-k8s/organization/variables.tf
+++ b/aws/arcgis-enterprise-k8s/organization/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Esri
+# Copyright 2024-2025 Esri
 #
 # Licensed under the Apache License Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,11 +43,6 @@ variable "helm_charts_version" {
   description = "Helm Charts for ArcGIS Enterprise on Kubernetes version"
   type        = string
   default     = "1.4.0"
-
-  validation {
-    condition     = contains(["1.2.0", "1.2.1", "1.2.2", "1.2.3", "1.3.0", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.4.0"], var.helm_charts_version)
-    error_message = "Valid values for helm_charts_version variable are 1.2.0, 1.2.1, 1.2.2, 1.2.3, 1.3.0, 1.3.1, 1.3.2, 1.3.3, 1.3.4 and 1.4.0."
-  }
 }
 
 variable "upgrade_token" {
diff --git a/azure/arcgis-enterprise-k8s/organization/modules/storage/main.tf b/azure/arcgis-enterprise-k8s/organization/modules/storage/main.tf
index a7ac06a..eaddc85 100644
--- a/azure/arcgis-enterprise-k8s/organization/modules/storage/main.tf
+++ b/azure/arcgis-enterprise-k8s/organization/modules/storage/main.tf
@@ -10,7 +10,7 @@
  * * Creates cloud config JSON file for the object store.
  */
 
-# Copyright 2024 Esri
+# Copyright 2024-2025 Esri
 #
 # Licensed under the Apache License Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ resource "azurerm_storage_account" "deployment_storage" {
 # Create blob container for the organization object store if cloud_config_json_file_path is not specified.
 resource "azurerm_storage_container" "object_store" {
   name                  = "object-store"
-  storage_account_name  = azurerm_storage_account.deployment_storage.name
+  storage_account_id    = azurerm_storage_account.deployment_storage.id
   container_access_type = "private"
 }
 
@@ -128,9 +128,7 @@ resource "local_sensitive_file" "cloud_config_json_file" {
       usage = "DEFAULT"
       connection = {
         containerName = azurerm_storage_container.object_store.name
-        # regionEndpointUrl = "https://${module.site_core_info.storage_account_name}.blob.core.windows.net"
         accountEndpointUrl = trimsuffix(azurerm_storage_account.deployment_storage.primary_blob_endpoint, "/")
-        # rootDir = var.deployment_id
       }
       category = "storage"
     }]
diff --git a/azure/arcgis-enterprise-k8s/organization/variables.tf b/azure/arcgis-enterprise-k8s/organization/variables.tf
index cb5aaac..03bcd79 100644
--- a/azure/arcgis-enterprise-k8s/organization/variables.tf
+++ b/azure/arcgis-enterprise-k8s/organization/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Esri
+# Copyright 2024-2025 Esri
 #
 # Licensed under the Apache License Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,11 +43,6 @@ variable "helm_charts_version" {
   description = "Helm Charts for ArcGIS Enterprise on Kubernetes version"
   type        = string
   default     = "1.4.0"
-
-  validation {
-    condition     = contains(["1.2.0", "1.2.1", "1.2.2", "1.2.3", "1.3.0", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.4.0"], var.helm_charts_version)
-    error_message = "Valid values for helm_charts_version variable are 1.2.0, 1.2.1, 1.2.2, 1.2.3, 1.3.0, 1.3.1, 1.3.2, 1.3.3, 1.3.4 and 1.4.0."
-  }
 }
 
 variable "upgrade_token" {