diff --git a/modules/autoscale/README.md b/modules/autoscale/README.md
index 8bf9104..45e8665 100755
--- a/modules/autoscale/README.md
+++ b/modules/autoscale/README.md
@@ -102,7 +102,7 @@ module "example_module" {
 | gateway_name                           | The name tag of the Security Gateways instances                                                                                                                                       | string       | **Default:** Check-Point-ASG-gateway-tf                                                                                   |
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                                            | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/> **Default:** c5.xlarge                                                                |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instances                                                                                                                            | string       |                                                                                                                                |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                                   | number       | **Default:** 100                                                                                                          |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                                   | number       | **Default:** 200                                                                                                          |
 | enable_volume_encryption               | Encrypt Environment instances volume with default AWS KMS key                                                                                                                         | bool         | true/false<br>**Default:** true                                                                                                  |
 | instances_tags                         | (Optional) A map of tags as key-value pairs. All tags will be added to all AutoScaling Group instances                                                                                 | map(string)  |                                                                                                                                |
 | metadata_imdsv2_required               | Set to true to deploy the instance with metadata v2 token required                                                                                                                    | bool         | true/false<br>**Default:** true                                                                                                  |
diff --git a/modules/autoscale/variables.tf b/modules/autoscale/variables.tf
index 6beb865..593bca6 100755
--- a/modules/autoscale/variables.tf
+++ b/modules/autoscale/variables.tf
@@ -72,7 +72,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -132,15 +132,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 variable "enable_instance_connect" {
   type = bool
diff --git a/modules/autoscale_gwlb/README.md b/modules/autoscale_gwlb/README.md
index 7892611..77b929d 100755
--- a/modules/autoscale_gwlb/README.md
+++ b/modules/autoscale_gwlb/README.md
@@ -85,7 +85,7 @@ module "example_module" {
 | gateway_name                           | The name tag of the Security Gateways instances                                                                                                                                | string       | **Default:** Check-Point-ASG-gateway-tf                                                                       |
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                                    | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/> **Default:** c5.xlarge                            |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instances                                                                                                                     | string       |                                                                                                               |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                            | number       | **Default:** 100                                                                                              |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                            | number       | **Default:** 200                                                                                              |
 | enable_volume_encryption               | Encrypt Environment instances volume with default AWS KMS key                                                                                                                  | bool         | true/false<br>**Default:** true                                                                               |
 | instances_tags                         | (Optional) A map of tags as key=value pairs. All tags will be added to all AutoScaling Group instances                                                                          | map(string)  | **Default:** {}                                                                                               |
 | metadata_imdsv2_required               | Set true to deploy the instance with metadata v2 token required                                                                                                                | bool         | true/false<br>**Default:** true                                                                               |
diff --git a/modules/autoscale_gwlb/variables.tf b/modules/autoscale_gwlb/variables.tf
index 9a60312..08eebad 100755
--- a/modules/autoscale_gwlb/variables.tf
+++ b/modules/autoscale_gwlb/variables.tf
@@ -84,7 +84,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -144,15 +144,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 variable "enable_instance_connect" {
   type = bool
diff --git a/modules/autoscale_master/README.md b/modules/autoscale_master/README.md
index 53c8d24..846a8fa 100644
--- a/modules/autoscale_master/README.md
+++ b/modules/autoscale_master/README.md
@@ -123,7 +123,7 @@ module "example_module" {
 | gateway_name                           | The name tag of the Security Gateways instances                                                                                                                                                                                                                                                                   | string       | **Default: Check-Point-ASG-gateway-tf**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                                                                                                                                                                        | string       | **Default: c5.xlarge** <br/> - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/>- m6a.32xlarge <br/> - m6a.48xlarge <br/> |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instances                                                                                                                                                                                                                                                        | string       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                               | number       | **Default: 100**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                               | number       | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | enable_volume_encryption               | Encrypt Environment instances volume with default AWS KMS key                                                                                                                                                                                                                                                     | bool         | **Default: true** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | instances_tags                         | (Optional) A map of tags as key=value pairs. All tags will be added on all Auto Scaling Group instances                                                                                                                                                                                                            | map(string)  | **Default: {}**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | metadata_imdsv2_required               | Set true to deploy the instance with metadata v2 token required                                                                                                                                                                                                                                                   | bool         | **Default: true** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
diff --git a/modules/autoscale_master/variables.tf b/modules/autoscale_master/variables.tf
index 0b94934..868c27a 100644
--- a/modules/autoscale_master/variables.tf
+++ b/modules/autoscale_master/variables.tf
@@ -83,7 +83,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -143,15 +143,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 variable "enable_instance_connect" {
   type = bool
diff --git a/modules/cluster/README.md b/modules/cluster/README.md
index b6e3609..cd6bf26 100755
--- a/modules/cluster/README.md
+++ b/modules/cluster/README.md
@@ -39,7 +39,7 @@ module "example_module" {
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -106,7 +106,7 @@ module "example_module" {
 | **gateway_instance_type** | The instance type of the Security Gateways | string | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/> **Default:** "c5.xlarge" |
 | **key_name** | The EC2 Key Pair name to allow SSH access to the instance | string | Required |
 | **allocate_and_associate_eip** | If true, an Elastic IP will be allocated and associated with each cluster member, in addition to the shared cluster Elastic IP | bool | true;<br/>false.<br/>**Default:** true |
-| **volume_size** | Root volume size (GB) - minimum 100 | number | **Default:** 100 |
+| **volume_size** | Root volume size (GB) - minimum 100 | number | **Default:** 200 |
 | **volume_encryption** | KMS or CMK key identifier. Use key ID, alias, or ARN. Key alias should be prefixed with 'alias/' | string | **Default:** "alias/aws/ebs" |
 | **enable_instance_connect** | Enable AWS Instance Connect. Supported regions are listed [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/) | bool | true;<br/>false.<br/>**Default:** false |
 | **disable_instance_termination** | Prevents an instance from accidental termination. Note: Setting this true may prevent `terraform destroy` from working properly | bool | true;<br/>false.<br/>**Default:** false |
diff --git a/modules/cluster/variables.tf b/modules/cluster/variables.tf
index ecbb78e..9a836c0 100755
--- a/modules/cluster/variables.tf
+++ b/modules/cluster/variables.tf
@@ -47,7 +47,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -104,26 +104,31 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Single AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Single AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/cluster_master/README.md b/modules/cluster_master/README.md
index b72b2b1..1fc1655 100755
--- a/modules/cluster_master/README.md
+++ b/modules/cluster_master/README.md
@@ -52,7 +52,7 @@ module "example_module" {
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -114,7 +114,7 @@ module "example_module" {
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                                       | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                                |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instance                                                                                                                        | string       |                                                                                                            |
 | allocate_and_associate_eip             | Allocate and associate Elastic IP for each cluster member, in addition to the shared cluster Elastic IP.                                                                         | bool         | true/false<br>**Default:** true                                                                               |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                              | number       | **Default:** 100                                                                                       |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                                              | number       | **Default:** 200                                                                                       |
 | volume_encryption                      | KMS or CMK key Identifier. Use key ID, alias, or ARN (e.g., alias/aws/ebs).                                                                                                     | string       | **Default:** alias/aws/ebs                                                                             |
 | enable_instance_connect                | Enable AWS Instance Connect. Supporting regions are listed [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/).                   | bool         | true/false<br>**Default:** false                                                                              |
 | disable_instance_termination           | Prevent accidental termination. Note: When set, `terraform destroy` may not work properly.                                                                                       | bool         | true/false<br>**Default:** false                                                                              |
diff --git a/modules/cluster_master/variables.tf b/modules/cluster_master/variables.tf
index 876e149..1dbea06 100755
--- a/modules/cluster_master/variables.tf
+++ b/modules/cluster_master/variables.tf
@@ -49,7 +49,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -106,26 +106,31 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Single AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Single AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/cross_az_cluster/README.md b/modules/cross_az_cluster/README.md
index a4dca0b..903a7b6 100755
--- a/modules/cross_az_cluster/README.md
+++ b/modules/cross_az_cluster/README.md
@@ -41,7 +41,7 @@ module "example_module" {
     gateway_name = "Check-Point-Cluster-tf"
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -102,7 +102,7 @@ module "example_module" {
 | gateway_name                           | (Optional) The name tag of the Security Gateway instances                                                                                                      | string       | **Default:** Check-Point-Cluster-tf                                                                          |
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                     | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                                  |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instance                                                                                                      | string       |                                                                                                                  |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                           | number       | **Default:** 100                                                                                            |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                           | number       | **Default:** 200                                                                                            |
 | volume_type                            | General Purpose SSD Volume Type                                                                                                                               | string       | - gp3<br>- gp2<br>**Default:** gp3                                                                                 |
 | volume_encryption                      | KMS or CMK key Identifier: Use key ID, alias, or ARN. Key alias should be prefixed with 'alias/'.                                                             | string       | **Default:** alias/aws/ebs                                                                                  |
 | enable_instance_connect                | Enable AWS Instance Connect. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/) | bool         | true/false<br>**Default:** false                                                                                   |
diff --git a/modules/cross_az_cluster/variables.tf b/modules/cross_az_cluster/variables.tf
index 429e47f..52553f4 100755
--- a/modules/cross_az_cluster/variables.tf
+++ b/modules/cross_az_cluster/variables.tf
@@ -42,7 +42,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -104,26 +104,31 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/cross_az_cluster_master/README.md b/modules/cross_az_cluster_master/README.md
index 3861295..8b5d864 100755
--- a/modules/cross_az_cluster_master/README.md
+++ b/modules/cross_az_cluster_master/README.md
@@ -54,7 +54,7 @@ module "example_module" {
     gateway_name = "Check-Point-Cluster-tf"
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -111,7 +111,7 @@ module "example_module" {
 | gateway_name                           | (Optional) The name tag of the Security Gateway instances                                                                                                  | string       | **Default:** Check-Point-Cluster-tf                                                          |
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                                 | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                    |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instance                                                                                                  | string       |                                                                                                    |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                       | number       | **Default:** 100                                                                             |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                       | number       | **Default:** 200                                                                             |
 | volume_type                            | General Purpose SSD Volume Type                                                                                                                           | string       | - gp3<br>- gp2<br>**Default:** gp3                                                                  |
 | volume_encryption                      | KMS or CMK key identifier. Use key ID, alias, or ARN. Prefix key alias with 'alias/' (e.g., alias/aws/ebs).                                                | string       | **Default:** alias/aws/ebs                                                                   |
 | enable_instance_connect                | Enable AWS Instance Connect. [More info](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                       | bool         | true/false<br>**Default:** false                                                                    |
diff --git a/modules/cross_az_cluster_master/variables.tf b/modules/cross_az_cluster_master/variables.tf
index 00bc971..9164443 100755
--- a/modules/cross_az_cluster_master/variables.tf
+++ b/modules/cross_az_cluster_master/variables.tf
@@ -44,7 +44,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -106,26 +106,31 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/gateway/README.md b/modules/gateway/README.md
index d6242d4..cba4d76 100755
--- a/modules/gateway/README.md
+++ b/modules/gateway/README.md
@@ -38,7 +38,7 @@ module "example_module" {
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -95,7 +95,7 @@ module "example_module" {
 | gateway_instance_type                          | The instance type of the Security Gateways                                                                             | string      | - c4.large<br/>- c4.xlarge<br/>- c5.large<br/>- c5.xlarge<br/>- c5.2xlarge<br/>- c5.4xlarge<br/>- c5.9xlarge<br/>- c5.12xlarge<br/>- c5.18xlarge<br/>- c5.24xlarge<br/>- c5n.large<br/>- c5n.xlarge<br/>- c5n.2xlarge<br/>- c5n.4xlarge<br/>- c5n.9xlarge<br/>- c5n.18xlarge<br/>- c5d.large<br/>- c5d.xlarge<br/>- c5d.2xlarge<br/>- c5d.4xlarge<br/>- c5d.9xlarge<br/>- c5d.12xlarge<br/>- c5d.18xlarge<br/>- c5d.24xlarge<br/>- m5.large<br/>- m5.xlarge<br/>- m5.2xlarge<br/>- m5.4xlarge<br/>- m5.8xlarge<br/>- m5.12xlarge<br/>- m5.16xlarge<br/>- m5.24xlarge<br/>- m6i.large<br/>- m6i.xlarge<br/>- m6i.2xlarge<br/>- m6i.4xlarge<br/>- m6i.8xlarge<br/>- m6i.12xlarge<br/>- m6i.16xlarge<br/>- m6i.24xlarge<br/>- m6i.32xlarge<br/>- c6i.large<br/>- c6i.xlarge<br/>- c6i.2xlarge<br/>- c6i.4xlarge<br/>- c6i.8xlarge<br/>- c6i.12xlarge<br/>- c6i.16xlarge<br/>- c6i.24xlarge<br/>- c6i.32xlarge<br/>- c6in.large<br/>- c6in.xlarge<br/>- c6in.2xlarge<br/>- c6in.4xlarge<br/>- c6in.8xlarge<br/>- c6in.12xlarge<br/>- c6in.16xlarge<br/>- c6in.24xlarge<br/>- c6in.32xlarge<br/>- r5.large<br/>- r5.xlarge<br/>- r5.2xlarge<br/>- r5.4xlarge<br/>- r5.8xlarge<br/>- r5.12xlarge<br/>- r5.16xlarge<br/>- r5.24xlarge<br/>- r5a.large<br/>- r5a.xlarge<br/>- r5a.2xlarge<br/>- r5a.4xlarge<br/>- r5a.8xlarge<br/>- r5a.12xlarge<br/>- r5a.16xlarge<br/>- r5a.24xlarge<br/>- r5b.large<br/>- r5b.xlarge<br/>- r5b.2xlarge<br/>- r5b.4xlarge<br/>- r5b.8xlarge<br/>- r5b.12xlarge<br/>- r5b.16xlarge<br/>- r5b.24xlarge<br/>- r5n.large<br/>- r5n.xlarge<br/>- r5n.2xlarge<br/>- r5n.4xlarge<br/>- r5n.8xlarge<br/>- r5n.12xlarge<br/>- r5n.16xlarge<br/>- r5n.24xlarge<br/>- r6i.large<br/>- r6i.xlarge<br/>- r6i.2xlarge<br/>- r6i.4xlarge<br/>- r6i.8xlarge<br/>- r6i.12xlarge<br/>- r6i.16xlarge<br/>- r6i.24xlarge<br/>- r6i.32xlarge<br/>- m6a.large<br/>- m6a.xlarge<br/>- m6a.2xlarge<br/>- m6a.4xlarge<br/>- m6a.8xlarge<br/>- m6a.12xlarge<br/>- m6a.16xlarge<br/>- m6a.24xlarge<br/>- m6a.32xlarge<br/>- m6a.48xlarge<br/>**Default:** c5.xlarge                                                                                                                                                                                                                                                             |
 | key_name                                       | The EC2 Key Pair name to allow SSH access to the instance                                                                 | string      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | allocate_and_associate_eip                     | If set to true, an elastic IP will be allocated and associated with the launched instance                                 | bool        | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| volume_size                                    | Root volume size (GB) - minimum 100                                                                                      | number      | **Default:** 100                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| volume_size                                    | Root volume size (GB) - minimum 100                                                                                      | number      | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | volume_encryption                              | KMS or CMK key Identifier: Use key ID, alias, or ARN. Key alias should be prefixed with 'alias/' (e.g., 'alias/aws/ebs')  | string      | **Default:** alias/aws/ebs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | enable_instance_connect                        | Enable SSH connection over AWS web console. Supporting regions [AWS docs](https://aws.amazon.com/about-aws/whats-new/...) | bool        | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | disable_instance_termination                   | Prevents an instance from accidental termination. Note: Once true, terraform destroy won't work                          | bool        | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
diff --git a/modules/gateway/variables.tf b/modules/gateway/variables.tf
index 7435cba..473d77e 100755
--- a/modules/gateway/variables.tf
+++ b/modules/gateway/variables.tf
@@ -47,7 +47,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -99,21 +99,25 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "gateway_TokenKey" {
   type = string
   description = "Follow the instructions in SK180501 to quickly connect this Gateway to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/gateway_instance/variables.tf b/modules/gateway_instance/variables.tf
index 5e6ac6b..e5586b1 100755
--- a/modules/gateway_instance/variables.tf
+++ b/modules/gateway_instance/variables.tf
@@ -33,7 +33,7 @@ variable "control_gateway_over_public_or_private_address" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -81,11 +81,13 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "admin_shell" {
   type = string
@@ -95,10 +97,12 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_TokenKey" {
   type = string
   description = "Follow the instructions in SK180501 to quickly connect this Gateway to Smart-1 Cloud."
+  sensitive = true
 }
 variable "gateway_bootstrap_script" {
   type = string
diff --git a/modules/gateway_master/README.md b/modules/gateway_master/README.md
index daca79d..ca7de7b 100755
--- a/modules/gateway_master/README.md
+++ b/modules/gateway_master/README.md
@@ -51,7 +51,7 @@ module "example_module" {
   gateway_instance_type = "c5.xlarge"
   key_name = "publickey"
   allocate_and_associate_eip = true
-  volume_size = 100
+  volume_size = 200
   volume_encryption = ""
   enable_instance_connect = false
   disable_instance_termination = false
@@ -96,7 +96,7 @@ module "example_module" {
 | gateway_instance_type                          | The instance type of the Security Gateways                                                                                                                                                                                                      | string      | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/> - c5n.18xlarge <br/> - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/> - c5d.18xlarge <br/> - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge<br/>**Default:** c5.xlarge                                                                                                                                  |
 | key_name                                       | The EC2 Key Pair name to allow SSH access to the instance                                                                                                                                                                                                                   | string      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | allocate_and_associate_eip                     | If set to true, an elastic IP will be allocated and associated with the launched instance                                                                                                                                                                                   | bool        | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| volume_size                                    | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                         | number      | **Default:** 100                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| volume_size                                    | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                         | number      | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | volume_encryption                              | KMS or CMK key Identifier: Use key ID, alias, or ARN. Key alias should be prefixed with 'alias/' (e.g., for KMS default alias 'aws/ebs' - insert 'alias/aws/ebs')                                                                                                           | string      | **Default:** alias/aws/ebs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | enable_instance_connect                        | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                                                                                              | bool        | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | disable_instance_termination                   | Prevents an instance from accidental termination. Note: Once this attribute is true, terraform destroy won't work properly                                                                                                                                                   | bool        | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
diff --git a/modules/gateway_master/variables.tf b/modules/gateway_master/variables.tf
index 4d11230..eceea62 100755
--- a/modules/gateway_master/variables.tf
+++ b/modules/gateway_master/variables.tf
@@ -49,7 +49,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -101,22 +101,26 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "gateway_TokenKey" {
   type = string
   description = "Follow the instructions in SK180501 to quickly connect this Gateway to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/gwlb/README.md b/modules/gwlb/README.md
index 68ab7e0..fd1fc1a 100755
--- a/modules/gwlb/README.md
+++ b/modules/gwlb/README.md
@@ -39,7 +39,7 @@ module "example_module" {
     // --- General Settings ---
     key_name = "publickey"
     enable_volume_encryption = true
-    volume_size = 100
+    volume_size = 200
     enable_instance_connect = false
     disable_instance_termination = false
     allow_upload_download = true
@@ -106,7 +106,7 @@ module "example_module" {
 | enable_instance_connect  | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/) | bool   | true/false<br>**Default:** false                                                                                       |
 | disable_instance_termination | Prevents an instance from accidental termination. Note: Once this attribute is true terraform destroy won't work properly | bool   | true/false<br>**Default:** false                                                                                       |
 | metadata_imdsv2_required  | Set true to deploy the instance with metadata v2 token required                                          | bool   | true/false<br>**Default:** true                                                                                        |
-| volume_size           | Instances volume size                                                                                     | number | **Default:** 100                                                                                                |
+| volume_size           | Instances volume size                                                                                     | number | **Default:** 200                                                                                                |
 | allow_upload_download | Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point | bool   | true/false<br>**Default:** true                                                                                        |
 | management_server     | The name that represents the Security Management Server in the automatic provisioning configuration         | string | **Default:** CP-Management-gwlb-tf                                                                              |
 | configuration_template | The tag is used by the Security Management Server to automatically provision the Security Gateways. Must be up to 12 alphanumeric characters and unique for each Quick Start deployment | string | **Default:** gwlb-configuration                                                                                |
diff --git a/modules/gwlb/variables.tf b/modules/gwlb/variables.tf
index 1cdf41b..06a1cf5 100755
--- a/modules/gwlb/variables.tf
+++ b/modules/gwlb/variables.tf
@@ -22,7 +22,7 @@ variable "enable_volume_encryption" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -140,15 +140,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 
 variable "gateways_provision_address_type" {
@@ -213,11 +216,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the management instance, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateways_policy" {
   type = string
diff --git a/modules/gwlb_master/README.md b/modules/gwlb_master/README.md
index bed664c..9cedb8a 100755
--- a/modules/gwlb_master/README.md
+++ b/modules/gwlb_master/README.md
@@ -44,7 +44,7 @@ module "example_module" {
     // --- General Settings ---
     key_name = "publickey"
     enable_volume_encryption = true
-    volume_size = 100
+    volume_size = 200
     enable_instance_connect = false
     disable_instance_termination = false
     allow_upload_download = true
@@ -102,7 +102,7 @@ module "example_module" {
 | enable_instance_connect                   | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                        | bool   | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | disable_instance_termination              | Prevents an instance from accidental termination. Note: Once this attribute is true, Terraform destroy won't work properly                                                                             | bool   | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | metadata_imdsv2_required                  | Set true to deploy the instance with metadata v2 token required                                                                                                                                        | bool   | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| volume_size                               | Instances volume size                                                                                                                                                                                  | number | **Default:** 100                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| volume_size                               | Instances volume size                                                                                                                                                                                  | number | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | allow_upload_download                     | Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point                                                                             | bool   | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | management_server                         | The name that represents the Security Management Server in the automatic provisioning configuration                                                                                                    | string | **Default:** CP-Management-gwlb-tf                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | configuration_template                    | The tag used by the Security Management Server to automatically provision the Security Gateways. Must be up to 12 alphanumeric characters and unique for each Quick Start deployment                   | string | **Default:** gwlb-configuration                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
diff --git a/modules/gwlb_master/variables.tf b/modules/gwlb_master/variables.tf
index 8358bd3..0ec3681 100755
--- a/modules/gwlb_master/variables.tf
+++ b/modules/gwlb_master/variables.tf
@@ -33,7 +33,7 @@ variable "enable_volume_encryption" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -151,15 +151,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 
 variable "gateways_provision_address_type" {
@@ -224,11 +227,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the management instance, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateways_policy" {
   type = string
diff --git a/modules/management/README.md b/modules/management/README.md
index 076b269..e8b936d 100755
--- a/modules/management/README.md
+++ b/modules/management/README.md
@@ -38,7 +38,7 @@ module "example_module" {
     management_instance_type = "m5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -82,7 +82,8 @@ module "example_module" {
 | management_name                           | (Optional) The name tag of the Security Management instance                                                                                                                                                 | string         | **Default:** Check-Point-Management-tf                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | management_instance_type                  | The instance type of the Security Management Server                                                                                                                                                        | string         | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** m5.xlarge |
 | key_name                                  | The EC2 Key Pair name to allow SSH access to the instance                                                                                                          | string         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| allocate_and_associate_eip               | If set to true, an elastic IP will be allocated and associated with the launched instance                                                                          | bool           | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| allocate_and_associate_eip               | If set to true, an elastic IP will be allocated and associated with the launched instance                                                                          | bool           | true/false<br/>**Default:** true                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| volume_size                               | Root volume size (GB) - minimum 100                                                                                                                                                                               | number       | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | volume_encryption                         | KMS or CMK key Identifier: Use key ID, alias, or ARN. Key alias should be prefixed with 'alias/' (e.g., for KMS default alias 'aws/ebs' - insert 'alias/aws/ebs') | string         | **Default:** alias/aws/ebs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | enable_instance_connect                   | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                                                                 | bool           | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | disable_instance_termination             | Prevents an instance from accidental termination. Note: Once this attribute is true, terraform destroy won't work properly                                        | bool           | true/false<br/>**Default:** false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
diff --git a/modules/management/variables.tf b/modules/management/variables.tf
index 3addb5d..f13953c 100755
--- a/modules/management/variables.tf
+++ b/modules/management/variables.tf
@@ -38,7 +38,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -108,11 +108,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Security Management Server Settings ---
@@ -130,6 +132,7 @@ variable "SICKey" {
   type = string
   description = "Mandatory only when deploying a secondary Management Server, the Secure Internal Communication key creates trusted connections between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
   default = ""
+  sensitive = true
 }
 variable "allow_upload_download" {
   type = bool
diff --git a/modules/management_master/README.md b/modules/management_master/README.md
index 9df2724..499648b 100644
--- a/modules/management_master/README.md
+++ b/modules/management_master/README.md
@@ -40,7 +40,7 @@ module "example_module" {
     management_instance_type = "m5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -84,7 +84,7 @@ module "example_module" {
 | management_instance_type                  | The instance type of the Security Management Server                                                                                                                                                                                                                                                               | string       | **Default: m5.xlarge** <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/>- m6a.32xlarge <br/> - m6a.48xlarge <br/> |
 | key_name                                  | The EC2 Key Pair name to allow SSH access to the instance                                                                                                                                                                                                                                                         | string       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | allocate_and_associate_eip                | If set to true, an elastic IP will be allocated and associated with the launched instance                                                                                                                                                                                                                         | bool         | **Default: true** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| volume_size                               | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                               | number       | **Default: 100**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| volume_size                               | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                               | number       | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | volume_encryption                         | KMS or CMK key Identifier: Use key ID, alias or ARN. Key alias should be prefixed with 'alias/' (e.g. for KMS default alias 'aws/ebs' - insert 'alias/aws/ebs')                                                                                                                                                   | string       | **Default: alias/aws/ebs**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | enable_instance_connect                   | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                                                                                                                                   | bool         | **Default: false** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | disable_instance_termination              | Prevents an instance from accidental termination. Note: Once this attribute is true terraform destroy won't work properly                                                                                                                                                                                         | bool         | **Default: false** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
diff --git a/modules/management_master/variables.tf b/modules/management_master/variables.tf
index c8e74e0..6f076aa 100644
--- a/modules/management_master/variables.tf
+++ b/modules/management_master/variables.tf
@@ -44,7 +44,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -114,11 +114,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Security Management Server Settings ---
@@ -136,6 +138,7 @@ variable "SICKey" {
   type = string
   description = "Mandatory only when deploying a secondary Management Server, the Secure Internal Communication key creates trusted connections between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
   default = ""
+  sensitive = true
 }
 variable "allow_upload_download" {
   type = bool
diff --git a/modules/mds/README.md b/modules/mds/README.md
index c2154ae..c2ef23f 100755
--- a/modules/mds/README.md
+++ b/modules/mds/README.md
@@ -35,7 +35,7 @@ module "example_module" {
     mds_name = "CP-MDS-tf"
     mds_instance_type = "m5.12xlarge"
     key_name = "publickey"
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -86,7 +86,7 @@ module "example_module" {
 | mds_name                           | (Optional) Name tag of the Multi-Domain Server                                                                                                              | string       | **Default:** Check-Point-MDS-tf                                                            |
 | mds_instance_type                  | Instance type of the Multi-Domain Server                                                                                                                    | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** m5.12xlarge                              |
 | key_name                           | EC2 Key Pair name to allow SSH access                                                                                                                       | string       |                                                                                                 |
-| volume_size                        | Root volume size (GB) - minimum 100                                                                                                                         | number       | **Default:** 100                                                                           |
+| volume_size                        | Root volume size (GB) - minimum 100                                                                                                                         | number       | **Default:** 200                                                                           |
 | volume_encryption                  | KMS or CMK key identifier (e.g., alias/aws/ebs)                                                                                                            | string       | **Default:** alias/aws/ebs                                                                |
 | enable_instance_connect            | Enable SSH connection over AWS web console                                                                                                                 | bool         | true/false<br>**Default:** false                                                                  |
 | disable_instance_termination       | Prevent accidental termination                                                                                                                             | bool         | true/false<br>**Default:** false                                                                  |
diff --git a/modules/mds/variables.tf b/modules/mds/variables.tf
index 092cd6e..025ea9b 100755
--- a/modules/mds/variables.tf
+++ b/modules/mds/variables.tf
@@ -33,7 +33,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -103,11 +103,13 @@ variable "mds_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "mds_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Multi-Domain Server Settings ---
@@ -120,6 +122,7 @@ variable "mds_SICKey" {
   type = string
   description = "Mandatory if deploying a Secondary Multi-Domain Server or Multi-Domain Log Server,  the Secure Internal Communication key creates trusted connections between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
   default = ""
+  sensitive = true
 }
 variable "allow_upload_download" {
   type = bool
diff --git a/modules/mds_master/README.md b/modules/mds_master/README.md
index f5a7f8d..8dae2a0 100644
--- a/modules/mds_master/README.md
+++ b/modules/mds_master/README.md
@@ -37,7 +37,7 @@ module "mds_master" {
   mds_name = "CP-MDS-tf"
   mds_instance_type = "m5.12xlarge"
   key_name = "publickey"
-  volume_size = 100
+  volume_size = 200
   volume_encryption = "alias/aws/ebs"
   enable_instance_connect = false
   disable_instance_termination = false
@@ -92,7 +92,7 @@ module "mds_master" {
 | security_rules                    | List of security rules for ingress and egress                                                                                                             | list(map)    |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | mds_instance_type                  | The instance type of the Multi-Domain Server                                                                                                                                                                                                                                                                     | string       | **Default: m5.12xlarge** <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/>- m6a.32xlarge <br/> - m6a.48xlarge |
 | key_name                           | The EC2 Key Pair name to allow SSH access to the instance                                                                                                                                                                                                                                                        | string       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| volume_size                        | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                              | number       | **Default: 100**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| volume_size                        | Root volume size (GB) - minimum 100                                                                                                                                                                                                                                                                              | number       | **Default:** 200                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | volume_encryption                  | KMS or CMK key Identifier: Use key ID, alias or ARN. Key alias should be prefixed with 'alias/' (e.g. for KMS default alias 'aws/ebs' - insert 'alias/aws/ebs')                                                                                                                                                  | string       | **Default: alias/aws/ebs**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | enable_instance_connect            | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)                                                                                                                                  | bool         | **Default: false** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | disable_instance_termination       | Prevents an instance from accidental termination. Note: Once this attribute is true terraform destroy won't work properly                                                                                                                                                                                        | bool         | **Default: false** <br/> true/false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
diff --git a/modules/mds_master/variables.tf b/modules/mds_master/variables.tf
index e089bb5..835cae2 100644
--- a/modules/mds_master/variables.tf
+++ b/modules/mds_master/variables.tf
@@ -39,7 +39,7 @@ variable "key_name" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -109,11 +109,13 @@ variable "mds_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "mds_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Multi-Domain Server Settings ---
@@ -126,6 +128,7 @@ variable "mds_SICKey" {
   type = string
   description = "Mandatory if deploying a Secondary Multi-Domain Server or Multi-Domain Log Server,  the Secure Internal Communication key creates trusted connections between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
   default = ""
+  sensitive = true
 }
 variable "allow_upload_download" {
   type = bool
diff --git a/modules/standalone/README.md b/modules/standalone/README.md
index 329ecc3..cd4af31 100755
--- a/modules/standalone/README.md
+++ b/modules/standalone/README.md
@@ -38,7 +38,7 @@ module "example_module" {
     standalone_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -89,7 +89,7 @@ module "example_module" {
 | standalone_instance_type               | Instance type of the Standalone instance                                                                                                                    | string       | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                |
 | key_name                               | EC2 Key Pair name to allow SSH access                                                                                                                       | string       |                                                                                                |
 | allocate_and_associate_eip             | Allocates and associates an Elastic IP                                                                                                                      | bool         | true/false<br>**Default:** true                                                                  |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                         | number       | **Default:** 100                                                                          |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                         | number       | **Default:** 200                                                                          |
 | volume_encryption                      | KMS or CMK key identifier (e.g., alias/aws/ebs)                                                                                                            | string       | **Default:** alias/aws/ebs                                                               |
 | enable_instance_connect                | Enable SSH connection over AWS web console                                                                                                                 | bool         | true/false<br>**Default:** false                                                                 |
 | disable_instance_termination           | Prevent accidental termination                                                                                                                             | bool         | true/false<br>**Default:** false                                                                 |
diff --git a/modules/standalone/variables.tf b/modules/standalone/variables.tf
index 4edda26..aca2ccf 100755
--- a/modules/standalone/variables.tf
+++ b/modules/standalone/variables.tf
@@ -47,7 +47,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -100,11 +100,13 @@ variable "standalone_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "standalone_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/standalone_master/README.md b/modules/standalone_master/README.md
index 89a46a9..04ab3fb 100755
--- a/modules/standalone_master/README.md
+++ b/modules/standalone_master/README.md
@@ -50,7 +50,7 @@ module "example_module" {
     standalone_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -98,7 +98,7 @@ module "example_module" {
 | standalone_instance_type                  | The instance type of the Security Gateway & Management (Standalone) instance                                                                          | string      | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                 |
 | key_name                                  | The EC2 Key Pair name to allow SSH access to the instances                                                                                            | string      |                                                                                                                 |
 | allocate_and_associate_eip                | Allocate and associate an Elastic IP with the launched instance                                                                                       | bool        | true/false<br>**Default:** true                                                                                   |
-| volume_size                               | Root volume size (GB)                                                                                                                                 | number      |**Default:** 100                                                                                           |
+| volume_size                               | Root volume size (GB)                                                                                                                                 | number      |**Default:** 200                                                                                           |
 | volume_encryption                         | KMS or CMK key Identifier                                                                                                                             | string      |**Default:** alias/aws/ebs                                                                                 |
 | enable_instance_connect                   | Enable SSH connection over AWS web console                                                                                                            | bool        | true/false<br>**Default:** false                                                                                   |
 | disable_instance_termination              | Prevent accidental termination of the instance                                                                                                        | bool        | true/false<br>**Default:** false                                                                                   |
diff --git a/modules/standalone_master/variables.tf b/modules/standalone_master/variables.tf
index 60a9e77..bec53fe 100755
--- a/modules/standalone_master/variables.tf
+++ b/modules/standalone_master/variables.tf
@@ -49,7 +49,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -102,11 +102,13 @@ variable "standalone_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "standalone_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/tgw_asg/variables.tf b/modules/tgw_asg/variables.tf
index dcf6c40..4e2172f 100755
--- a/modules/tgw_asg/variables.tf
+++ b/modules/tgw_asg/variables.tf
@@ -88,15 +88,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "enable_cloudwatch" {
   type = bool
@@ -141,11 +144,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
+  sensitive = true
 }
 variable "management_permissions" {
   type = string
diff --git a/modules/tgw_asg_master/variables.tf b/modules/tgw_asg_master/variables.tf
index 11c039b..2815244 100755
--- a/modules/tgw_asg_master/variables.tf
+++ b/modules/tgw_asg_master/variables.tf
@@ -94,15 +94,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "enable_cloudwatch" {
   type = bool
@@ -147,11 +150,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the management instance, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "management_permissions" {
   type = string
diff --git a/modules/tgw_cross_az_cluster/README.md b/modules/tgw_cross_az_cluster/README.md
index 4111556..f08f25f 100755
--- a/modules/tgw_cross_az_cluster/README.md
+++ b/modules/tgw_cross_az_cluster/README.md
@@ -42,7 +42,7 @@ module "example_module" {
     gateway_instance_type = "c5.xlarge"
     key_name = "publickey"
     allocate_and_associate_eip = true
-    volume_size = 100
+    volume_size = 200
     volume_encryption = "alias/aws/ebs"
     enable_instance_connect = false
     disable_instance_termination = false
@@ -110,7 +110,7 @@ module "example_module" {
 | gateway_instance_type                     | The instance type of the Security Gateways                                                                                                                                        | string      | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                                      |
 | key_name                                  | The EC2 Key Pair name to allow SSH access to the instance                                                                                                                          | string      |                                                                                                                                                              |
 | allocate_and_associate_eip                | If true, an elastic IP will be allocated and associated with each cluster member                                                                                                   | bool        | true/false<br>**Default:** true                                                                                        |
-| volume_size                               | Root volume size (GB) - minimum 100                                                                                                                                                | number      | **Default:** 100                                                                                                 |
+| volume_size                               | Root volume size (GB) - minimum 100                                                                                                                                                | number      | **Default:** 200                                                                                                 |
 | volume_type                               | General Purpose SSD Volume Type                                                                                                                                                    | string      | - gp3<br>- gp2<br>**Default:** gp3                                                                                    |
 | volume_encryption                         | KMS or CMK key Identifier. Use key ID, alias, or ARN.                                                                                                                              | string      | **Default:** alias/aws/ebs                                                                                      |
 | enable_instance_connect                   | Enable AWS Instance Connect                                                                                                                 | bool        | true/false<br>**Default:** false                                                                                       |
diff --git a/modules/tgw_cross_az_cluster/variables.tf b/modules/tgw_cross_az_cluster/variables.tf
index a571796..7a0ba59 100755
--- a/modules/tgw_cross_az_cluster/variables.tf
+++ b/modules/tgw_cross_az_cluster/variables.tf
@@ -63,7 +63,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -125,25 +125,30 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/tgw_cross_az_cluster_master/README.md b/modules/tgw_cross_az_cluster_master/README.md
index 2718d4b..7aa4c64 100755
--- a/modules/tgw_cross_az_cluster_master/README.md
+++ b/modules/tgw_cross_az_cluster_master/README.md
@@ -53,7 +53,7 @@ module "example_module" {
       gateway_instance_type = "c5.xlarge"
       key_name = "publickey"
       allocate_and_associate_eip = true
-      volume_size = 100
+      volume_size = 200
       volume_encryption = "alias/aws/ebs"
       enable_instance_connect = false
       disable_instance_termination = false
@@ -119,7 +119,7 @@ module "example_module" {
 | gateway_instance_type                  | The instance type of the Security Gateways                                                                                                         | string      | - c4.large <br/> - c4.xlarge <br/> - c5.large <br/> - c5.xlarge <br/> - c5.2xlarge <br/> - c5.4xlarge <br/> - c5.9xlarge <br/> - c5.12xlarge <br/> - c5.18xlarge <br/> - c5.24xlarge <br/> - c5n.large <br/> - c5n.xlarge <br/> - c5n.2xlarge <br/> - c5n.4xlarge <br/> - c5n.9xlarge <br/>  - c5n.18xlarge <br/>  - c5d.large <br/> - c5d.xlarge <br/> - c5d.2xlarge <br/> - c5d.4xlarge <br/> - c5d.9xlarge <br/> - c5d.12xlarge <br/>  - c5d.18xlarge <br/>  - c5d.24xlarge <br/> - m5.large <br/> - m5.xlarge <br/> - m5.2xlarge <br/> - m5.4xlarge <br/> - m5.8xlarge <br/> - m5.12xlarge <br/> - m5.16xlarge <br/> - m5.24xlarge <br/> - m6i.large <br/> - m6i.xlarge <br/> - m6i.2xlarge <br/> - m6i.4xlarge <br/> - m6i.8xlarge <br/> - m6i.12xlarge <br/> - m6i.16xlarge <br/> - m6i.24xlarge <br/> - m6i.32xlarge <br/> - c6i.large <br/> - c6i.xlarge <br/> - c6i.2xlarge <br/> - c6i.4xlarge <br/> - c6i.8xlarge <br/> - c6i.12xlarge <br/> - c6i.16xlarge <br/> - c6i.24xlarge <br/> - c6i.32xlarge <br/> - c6in.large <br/> - c6in.xlarge <br/> - c6in.2xlarge <br/> - c6in.4xlarge <br/> - c6in.8xlarge <br/> - c6in.12xlarge <br/> - c6in.16xlarge <br/> - c6in.24xlarge <br/> - c6in.32xlarge <br/> - r5.large <br/> - r5.xlarge <br/> - r5.2xlarge <br/> - r5.4xlarge <br/> - r5.8xlarge <br/> - r5.12xlarge <br/> - r5.16xlarge <br/> - r5.24xlarge <br/> - r5a.large <br/> - r5a.xlarge <br/> - r5a.2xlarge <br/> - r5a.4xlarge <br/> - r5a.8xlarge <br/> - r5a.12xlarge <br/> - r5a.16xlarge <br/> - r5a.24xlarge <br/> - r5b.large <br/> - r5b.xlarge <br/> - r5b.2xlarge <br/> - r5b.4xlarge <br/> - r5b.8xlarge <br/> - r5b.12xlarge <br/> - r5b.16xlarge <br/> - r5b.24xlarge <br/> - r5n.large <br/> - r5n.xlarge <br/> - r5n.2xlarge <br/> - r5n.4xlarge <br/> - r5n.8xlarge <br/> - r5n.12xlarge <br/> - r5n.16xlarge <br/> - r5n.24xlarge <br/> - r6i.large <br/> - r6i.xlarge <br/> - r6i.2xlarge <br/> - r6i.4xlarge <br/> - r6i.8xlarge <br/> - r6i.12xlarge <br/> - r6i.16xlarge <br/> - r6i.24xlarge <br/> - r6i.32xlarge <br/> - m6a.large <br/> - m6a.xlarge <br/> - m6a.2xlarge  <br/> - m6a.4xlarge <br/> - m6a.8xlarge <br/> - m6a.12xlarge <br/> - m6a.16xlarge <br/> - m6a.24xlarge <br/> - m6a.32xlarge <br/> - m6a.48xlarge <br/>**Default:** c5.xlarge                              |
 | key_name                               | The EC2 Key Pair name to allow SSH access to the instance                                                                                          | string      |                                                                                                              |
 | allocate_and_associate_eip             | If true, an elastic IP will be allocated and associated with each cluster member.                                                                  | bool        | true/false<br>**Default:** true                                                                                 |
-| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                | number      |**Default:** 100                                                                                        |
+| volume_size                            | Root volume size (GB) - minimum 100                                                                                                                | number      |**Default:** 200                                                                                        |
 | volume_type                            | General Purpose SSD Volume Type                                                                                                                    | string      | - gp3<br>- gp2<br>**Default:** gp3                                                                             |
 | volume_encryption                      | KMS or CMK key identifier. Use key ID, alias, or ARN. Key alias should be prefixed with `alias/` (e.g., `alias/aws/ebs`).                          | string      |**Default:** alias/aws/ebs                                                                              |
 | enable_instance_connect                | Enable AWS Instance Connect                                                                                                                        | bool        | true/false<br>**Default:** false                                                                               |
diff --git a/modules/tgw_cross_az_cluster_master/variables.tf b/modules/tgw_cross_az_cluster_master/variables.tf
index f268a00..f2e38f6 100755
--- a/modules/tgw_cross_az_cluster_master/variables.tf
+++ b/modules/tgw_cross_az_cluster_master/variables.tf
@@ -62,7 +62,7 @@ variable "allocate_and_associate_eip" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Volume Size validation - resource will not be created if the volume size is smaller than 100
@@ -124,25 +124,30 @@ variable "admin_shell" {
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components. Choose a random string consisting of at least 8 alphanumeric characters"
+  sensitive = true
 }
 variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 // --- Quick connect to Smart-1 Cloud (Recommended) ---
 variable "memberAToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 variable "memberBToken" {
   type = string
   description = "Follow the instructions in sk180501 to quickly connect this Cross AZ Cluster to Smart-1 Cloud."
+  sensitive = true
 }
 
 // --- Advanced Settings ---
diff --git a/modules/tgw_gwlb/README.md b/modules/tgw_gwlb/README.md
index d92beff..a01ec92 100755
--- a/modules/tgw_gwlb/README.md
+++ b/modules/tgw_gwlb/README.md
@@ -60,7 +60,7 @@ module "example_module" {
     // --- General Settings ---
     key_name = "publickey"
     enable_volume_encryption = true
-    volume_size = 100
+    volume_size = 200
     enable_instance_connect = false
     disable_instance_termination = false
     allow_upload_download = true
@@ -143,7 +143,7 @@ module "example_module" {
 | enable_instance_connect                | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)   | bool         | true/false<br>**Default:** false                                                                                                                                                                                                               |
 | disable_instance_termination           | Prevents an instance from accidental termination. Note: Once this attribute is true terraform destroy won't work properly                                                         | bool         | true/false<br>**Default:** false                                                                                                                                                                                                               |
 | metadata_imdsv2_required               | Set true to deploy the instance with metadata v2 token required                                                                                                                   | bool         | true/false<br>**Default:** true                                                                                                                                                                                                                |
-| volume_size                            | Instances volume size                                                                                                                                                             | number       | **Default:** 100                                                                                                                                                                                                                       |
+| volume_size                            | Instances volume size                                                                                                                                                             | number       | **Default:** 200                                                                                                                                                                                                                       |
 | allow_upload_download                  | Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point                                                         | bool         | true/false<br>**Default:** true                                                                                                                                                                                                                |
 | configuration_template                 | The tag is used by the Security Management Server to automatically provision the Security Gateways. Must be up to 12 alphanumeric characters and unique for each Quick Start deployment | string       | **Default:** gwlb-ter                                                                                                                                                                                                                   |
 | admin_shell                            | Set the admin shell to enable advanced command line configuration                                                                                                                 | string       | - /etc/cli.sh<br>- /bin/bash<br>- /bin/csh<br>- /bin/tcsh<br>**Default:** /etc/cli.sh                                                                                                                   |
diff --git a/modules/tgw_gwlb/variables.tf b/modules/tgw_gwlb/variables.tf
index a711f33..46e8d40 100755
--- a/modules/tgw_gwlb/variables.tf
+++ b/modules/tgw_gwlb/variables.tf
@@ -97,7 +97,7 @@ variable "enable_volume_encryption" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -217,15 +217,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 
 variable "gateways_provision_address_type" {
@@ -290,11 +293,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the management instance, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateways_policy" {
   type = string
diff --git a/modules/tgw_gwlb_master/README.md b/modules/tgw_gwlb_master/README.md
index 600e50a..fea1859 100755
--- a/modules/tgw_gwlb_master/README.md
+++ b/modules/tgw_gwlb_master/README.md
@@ -66,7 +66,7 @@ module "example_module" {
     // --- General Settings ---
     key_name = "publickey"
     enable_volume_encryption = true
-    volume_size = 100
+    volume_size = 200
     enable_instance_connect = false
     disable_instance_termination = false
     allow_upload_download = true
@@ -143,7 +143,7 @@ module "example_module" {
 | enable_instance_connect                   | Enable SSH connection over AWS web console. Supporting regions can be found [here](https://aws.amazon.com/about-aws/whats-new/2019/06/introducing-amazon-ec2-instance-connect/)   | bool         | true/false<br>**Default:** false                                                                                                                                          |
 | disable_instance_termination              | Prevents accidental termination. Note: When true, `terraform destroy` won’t work properly.                                                                                        | bool         | true/false<br>**Default:** false                                                                                                                                          |
 | metadata_imdsv2_required                  | Set true to deploy instances with IMDSv2 metadata token required.                                                                                                                | bool         | true/false<br>**Default:** true                                                                                                                                           |
-| volume_size                               | Instance volume size                                                                                                                                                             | number       | **Default:** 100                                                                                                                                                   |
+| volume_size                               | Instance volume size                                                                                                                                                             | number       | **Default:** 200                                                                                                                                                   |
 | allow_upload_download                     | Automatically download Blade Contracts and other data.                                                                                                                            | bool         | true/false<br>**Default:** true                                                                                                                                           |
 | management_server                         | The name representing the Security Management Server in the automatic provisioning configuration.                                                                                 | string       | **Default:** CP-Management-gwlb-tf                                                                                                                                |
 | configuration_template                    | The provisioning tag for the Security Gateways. Must be up to 12 alphanumeric characters and unique.                                                                              | string       | **Default:** gwlb-ter                                                                                                                                              |
diff --git a/modules/tgw_gwlb_master/variables.tf b/modules/tgw_gwlb_master/variables.tf
index 35afa78..f2a69d6 100755
--- a/modules/tgw_gwlb_master/variables.tf
+++ b/modules/tgw_gwlb_master/variables.tf
@@ -89,7 +89,7 @@ variable "enable_volume_encryption" {
 variable "volume_size" {
   type = number
   description = "Root volume size (GB) - minimum 100"
-  default = 100
+  default = 200
 }
 resource "null_resource" "volume_size_too_small" {
   // Will fail if var.volume_size is less than 100
@@ -209,15 +209,18 @@ variable "gateway_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "gateway_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the gateway instances, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateway_SICKey" {
   type = string
   description = "The Secure Internal Communication key for trusted connection between Check Point components (at least 8 alphanumeric characters)"
+  sensitive = true
 }
 
 variable "gateways_provision_address_type" {
@@ -283,11 +286,13 @@ variable "management_password_hash" {
   type = string
   description = "(Optional) Admin user's password hash (use command 'openssl passwd -6 PASSWORD' to get the PASSWORD's hash)"
   default = ""
+  sensitive = true
 }
 variable "management_maintenance_mode_password_hash" {
   description = "Maintenance mode password hash for the management instance, relevant only for R81.20 and higher versions"
   type = string
   default = ""
+  sensitive = true
 }
 variable "gateways_policy" {
   type = string