diff --git a/ibm_catalog.json b/ibm_catalog.json
index d4d6ece3..3a4b375b 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -510,7 +510,7 @@
               "default_value": "us-south"
             },
             {
-              "key": "allow_public_access_to_cluster",
+              "key": "allow_public_access_to_cluster_management",
               "required": true
             },
             {
@@ -1467,7 +1467,7 @@
               }
             },
             {
-              "key": "allow_public_access_to_cluster"
+              "key": "allow_public_access_to_cluster_management"
             },
             {
               "key": "allow_outbound_traffic"
diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
index dbd53bc0..4dae249a 100644
--- a/solutions/fully-configurable/main.tf
+++ b/solutions/fully-configurable/main.tf
@@ -225,7 +225,7 @@ module "ocp_base" {
   cluster_ready_when                       = var.cluster_ready_when
   custom_security_group_ids                = var.custom_security_group_ids
   disable_outbound_traffic_protection      = var.allow_outbound_traffic
-  disable_public_endpoint                  = !var.allow_public_access_to_cluster
+  disable_public_endpoint                  = !var.allow_public_access_to_cluster_management
   enable_ocp_console                       = var.enable_ocp_console
   ignore_worker_pool_size_changes          = var.ignore_worker_pool_size_changes
   kms_config                               = local.kms_config
diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf
index e8704ecb..7e70cf76 100644
--- a/solutions/fully-configurable/variables.tf
+++ b/solutions/fully-configurable/variables.tf
@@ -266,9 +266,9 @@ variable "use_private_endpoint" {
   default     = true
 }
 
-variable "allow_public_access_to_cluster" {
+variable "allow_public_access_to_cluster_management" {
   type        = bool
-  description = "Set to true to allow public access to master node of the cluster by enabling public endpoint."
+  description = "Set to true to allow public access to master node of the cluster by enabling public endpoint. WARNING: This setting cannot be changed after cluster creation."
   default     = false
 }
 
diff --git a/solutions/quickstart/main.tf b/solutions/quickstart/main.tf
index cfb15099..fcde41e5 100644
--- a/solutions/quickstart/main.tf
+++ b/solutions/quickstart/main.tf
@@ -142,6 +142,6 @@ module "ocp_base" {
   worker_pools                        = local.worker_pools
   disable_outbound_traffic_protection = var.allow_outbound_traffic
   access_tags                         = var.access_tags
-  disable_public_endpoint             = !var.allow_public_access_to_cluster
+  disable_public_endpoint             = !var.allow_public_access_to_cluster_management
   cluster_config_endpoint_type        = "default"
 }
diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf
index 23791a57..b97dd97b 100644
--- a/solutions/quickstart/variables.tf
+++ b/solutions/quickstart/variables.tf
@@ -91,9 +91,9 @@ variable "size" {
   default     = "mini"
 }
 
-variable "allow_public_access_to_cluster" {
+variable "allow_public_access_to_cluster_management" {
   type        = bool
-  description = "Set to true to allow public access to master node of the cluster by enabling public endpoint."
+  description = "Set to true to allow public access to master node of the cluster by enabling public endpoint. WARNING: This setting cannot be changed after cluster creation."
   default     = true
 }