diff --git a/modules/autoscale/README.md b/modules/autoscale/README.md
index 5a95282..2a15610 100755
--- a/modules/autoscale/README.md
+++ b/modules/autoscale/README.md
@@ -27,7 +27,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/autoscale"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- Environment ---
     prefix = "env1"
diff --git a/modules/autoscale/asg_userdata.yaml b/modules/autoscale/asg_userdata.yaml
index bc4f98a..1c49b7e 100755
--- a/modules/autoscale/asg_userdata.yaml
+++ b/modules/autoscale/asg_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"autoscale\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"autoscale\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"
diff --git a/modules/autoscale_gwlb/README.md b/modules/autoscale_gwlb/README.md
index fce1b8f..bb8278a 100755
--- a/modules/autoscale_gwlb/README.md
+++ b/modules/autoscale_gwlb/README.md
@@ -26,7 +26,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/autoscale_gwlb"
-    version = "1.0.6"
+    version = "1.0.7"
 
         // --- Environment ---
     prefix = "env1"
diff --git a/modules/autoscale_gwlb/asg_userdata.yaml b/modules/autoscale_gwlb/asg_userdata.yaml
index f64ce29..4ad57e0 100755
--- a/modules/autoscale_gwlb/asg_userdata.yaml
+++ b/modules/autoscale_gwlb/asg_userdata.yaml
@@ -25,4 +25,4 @@ bootcmd:
     - $CGEDIR/scripts/hairpin_on.sh AwsGwlb
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"autoscale_gwlb\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"autoscale_gwlb\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
diff --git a/modules/autoscale_master/README.md b/modules/autoscale_master/README.md
index f9af3aa..620d67b 100644
--- a/modules/autoscale_master/README.md
+++ b/modules/autoscale_master/README.md
@@ -29,7 +29,7 @@ provider "aws" {}
 module "example_module" {
 
     source = "checkpointsw/cloudguard-network-security/aws//modules/autoscale_master"
-    version = "1.0.6"
+    version = "1.0.7"
     
     // VPC Configuration
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/cluster/README.md b/modules/cluster/README.md
index cd278b0..d17d232 100755
--- a/modules/cluster/README.md
+++ b/modules/cluster/README.md
@@ -26,7 +26,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cluster"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/cluster/cluster_member_a_userdata.yaml b/modules/cluster/cluster_member_a_userdata.yaml
index c9ccded..56ca4d0 100755
--- a/modules/cluster/cluster_member_a_userdata.yaml
+++ b/modules/cluster/cluster_member_a_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenA}\"" installationType=\"cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" elasticIp=\"${MemberAPublicAddress}\" templateVersion=\"1.0.6\" templateName=\"cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" allocatePublicAddress=\"${AllocateAddress}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenA}\"" installationType=\"cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" elasticIp=\"${MemberAPublicAddress}\" templateVersion=\"1.0.7\" templateName=\"cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" allocatePublicAddress=\"${AllocateAddress}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/cluster/cluster_member_b_userdata.yaml b/modules/cluster/cluster_member_b_userdata.yaml
index 95493ba..674da03 100755
--- a/modules/cluster/cluster_member_b_userdata.yaml
+++ b/modules/cluster/cluster_member_b_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenB}\"" installationType=\"cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" elasticIp=\"${MemberBPublicAddress}\" templateVersion=\"1.0.6\" templateName=\"cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" allocatePublicAddress=\"${AllocateAddress}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenB}\"" installationType=\"cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" elasticIp=\"${MemberBPublicAddress}\" templateVersion=\"1.0.7\" templateName=\"cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" allocatePublicAddress=\"${AllocateAddress}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/cluster_master/README.md b/modules/cluster_master/README.md
index 9aca27d..d91ff81 100755
--- a/modules/cluster_master/README.md
+++ b/modules/cluster_master/README.md
@@ -34,7 +34,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cluster_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
 
     // --- VPC Network Configuration ---
diff --git a/modules/cme_iam_role/README.md b/modules/cme_iam_role/README.md
index 9d5400a..e1f145c 100755
--- a/modules/cme_iam_role/README.md
+++ b/modules/cme_iam_role/README.md
@@ -23,7 +23,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cme_iam_role"
-    version = "1.0.6"
+    version = "1.0.7"
 
     permissions = "Create with read permissions"
     sts_roles = ['arn:aws:iam::111111111111:role/role_name']
diff --git a/modules/cme_iam_role_gwlb/README.md b/modules/cme_iam_role_gwlb/README.md
index 8f09584..b9b5b22 100755
--- a/modules/cme_iam_role_gwlb/README.md
+++ b/modules/cme_iam_role_gwlb/README.md
@@ -23,7 +23,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cme_iam_role_gwlb"
-    version = "1.0.6"
+    version = "1.0.7"
 
     permissions = "Create with read permissions"
     sts_roles = ['arn:aws:iam::111111111111:role/role_name']
diff --git a/modules/cross_az_cluster/README.md b/modules/cross_az_cluster/README.md
index 46f92b2..cd4be00 100755
--- a/modules/cross_az_cluster/README.md
+++ b/modules/cross_az_cluster/README.md
@@ -28,7 +28,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cross_az_cluster"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/cross_az_cluster/cluster_member_a_userdata.yaml b/modules/cross_az_cluster/cluster_member_a_userdata.yaml
index 098b6f3..a22371a 100755
--- a/modules/cross_az_cluster/cluster_member_a_userdata.yaml
+++ b/modules/cross_az_cluster/cluster_member_a_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenA}\"" installationType=\"cross-az-cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"cross_az_cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" elasticIp=\"${MemberAPublicAddress}\" otherMemberIp=\"${MemberBPrivateAddressCluster}\" clusterIp=\"${PublicAddressCluster}\" secondaryIp=\"${MemberAPrivateAddressSecondary}\" otherMemberPrivateClusterIp=\"${MemberBPrivateAddressSecondary}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenA}\"" installationType=\"cross-az-cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"cross_az_cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" elasticIp=\"${MemberAPublicAddress}\" otherMemberIp=\"${MemberBPrivateAddressCluster}\" clusterIp=\"${PublicAddressCluster}\" secondaryIp=\"${MemberAPrivateAddressSecondary}\" otherMemberPrivateClusterIp=\"${MemberBPrivateAddressSecondary}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/cross_az_cluster/cluster_member_b_userdata.yaml b/modules/cross_az_cluster/cluster_member_b_userdata.yaml
index 27f332f..d64be78 100755
--- a/modules/cross_az_cluster/cluster_member_b_userdata.yaml
+++ b/modules/cross_az_cluster/cluster_member_b_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenB}\"" installationType=\"cross-az-cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"cross_az_cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" elasticIp=\"${MemberBPublicAddress}\" otherMemberIp=\"${MemberAPrivateAddressCluster}\" clusterIp=\"${PublicAddressCluster}\" secondaryIp=\"${MemberBPrivateAddressSecondary}\" otherMemberPrivateClusterIp=\"${MemberAPrivateAddressSecondary}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenB}\"" installationType=\"cross-az-cluster\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"cross_az_cluster\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname}\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" elasticIp=\"${MemberBPublicAddress}\" otherMemberIp=\"${MemberAPrivateAddressCluster}\" clusterIp=\"${PublicAddressCluster}\" secondaryIp=\"${MemberBPrivateAddressSecondary}\" otherMemberPrivateClusterIp=\"${MemberAPrivateAddressSecondary}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/cross_az_cluster_master/README.md b/modules/cross_az_cluster_master/README.md
index d561569..61f93b2 100755
--- a/modules/cross_az_cluster_master/README.md
+++ b/modules/cross_az_cluster_master/README.md
@@ -34,7 +34,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/cross_az_cluster_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/gateway/README.md b/modules/gateway/README.md
index c768e6b..311bca0 100755
--- a/modules/gateway/README.md
+++ b/modules/gateway/README.md
@@ -25,7 +25,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/gateway"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/gateway_instance/gateway_userdata.yaml b/modules/gateway_instance/gateway_userdata.yaml
index e06049a..ab754ad 100755
--- a/modules/gateway_instance/gateway_userdata.yaml
+++ b/modules/gateway_instance/gateway_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenKey}\"" installationType=\"gateway\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"gateway\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" "smart1CloudToken=\"${TokenKey}\"" installationType=\"gateway\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"gateway\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${GatewayBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/gateway_master/README.md b/modules/gateway_master/README.md
index caac1d4..2fc8dd1 100755
--- a/modules/gateway_master/README.md
+++ b/modules/gateway_master/README.md
@@ -34,7 +34,7 @@ provider "aws" {}
 module "example_module" {
 
   source  = "CheckPointSW/cloudguard-network-security/aws//modules/gateway_master"
-  version = "1.0.6"
+  version = "1.0.7"
 
     // --- VPC Network Configuration ---
   vpc_cidr = "10.0.0.0/16"
diff --git a/modules/gwlb/README.md b/modules/gwlb/README.md
index 73d29ca..968e056 100755
--- a/modules/gwlb/README.md
+++ b/modules/gwlb/README.md
@@ -30,7 +30,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/gwlb"
-    version = "1.0.6"
+    version = "1.0.7"
 
         // --- VPC Network Configuration ---
     vpc_id = "vpc-12345"
diff --git a/modules/gwlb/main.tf b/modules/gwlb/main.tf
index d4bd7c1..231f2e0 100755
--- a/modules/gwlb/main.tf
+++ b/modules/gwlb/main.tf
@@ -19,6 +19,9 @@ module "gateway_load_balancer" {
   listener_port = 6081
   cross_zone_load_balancing = var.enable_cross_zone_load_balancing
   ip_mode = var.ip_mode
+
+  // default tcp timeout 1 hour
+  tcp_idle_timeout = 3600
 }
 
 resource "aws_vpc_endpoint_service" "gwlb_endpoint_service" {
diff --git a/modules/gwlb_master/README.md b/modules/gwlb_master/README.md
index d4248c8..81817d5 100755
--- a/modules/gwlb_master/README.md
+++ b/modules/gwlb_master/README.md
@@ -31,7 +31,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/gwlb_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- Network Configuration ---
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/load_balancer/main.tf b/modules/load_balancer/main.tf
index 9bc4f5c..3e341df 100755
--- a/modules/load_balancer/main.tf
+++ b/modules/load_balancer/main.tf
@@ -30,6 +30,7 @@ resource "aws_lb_listener" "lb_listener" {
   certificate_arn = var.certificate_arn
   protocol = var.load_balancers_type != "gateway" ? var.load_balancer_protocol : null
   port = var.load_balancers_type != "gateway" ? var.listener_port : null
+  tcp_idle_timeout_seconds = var.tcp_idle_timeout > 0 ? var.tcp_idle_timeout : null
   default_action {
     type = "forward"
     target_group_arn = aws_lb_target_group.lb_target_group.arn
diff --git a/modules/load_balancer/variables.tf b/modules/load_balancer/variables.tf
index 8aa78c7..f8c744c 100755
--- a/modules/load_balancer/variables.tf
+++ b/modules/load_balancer/variables.tf
@@ -60,6 +60,17 @@ variable "health_check_protocol" {
   type = string
   default = null
 }
+
+variable "tcp_idle_timeout" {
+  description = "The idle timeout of the load balancer."
+  type = number
+  default = null
+  validation {
+    condition = var.tcp_idle_timeout == null || (var.tcp_idle_timeout >= 60 && var.tcp_idle_timeout <= 6000)
+    error_message = "The tcp_idle_timeout value must be between 60 and 6000 seconds"
+  }
+}
+
 variable "ip_mode" {
   type = string
   description = "IP mode of AWS resources."
diff --git a/modules/management/README.md b/modules/management/README.md
index 80df935..d244956 100755
--- a/modules/management/README.md
+++ b/modules/management/README.md
@@ -27,7 +27,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/management"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/management/management_userdata.yaml b/modules/management/management_userdata.yaml
index 1fef460..ddbf3a1 100755
--- a/modules/management/management_userdata.yaml
+++ b/modules/management/management_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py sicKey=\"${SICKey}\" installationType=\"management\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"management\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" "management_installation_type=\"${ManagementInstallationType}\"" adminSubnet=\"${AdminSubnet}\" allocatePublicAddress=\"${AllocateElasticIP}\" overTheInternet=\"${PubMgmt}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py sicKey=\"${SICKey}\" installationType=\"management\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"management\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" "management_installation_type=\"${ManagementInstallationType}\"" adminSubnet=\"${AdminSubnet}\" allocatePublicAddress=\"${AllocateElasticIP}\" overTheInternet=\"${PubMgmt}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
diff --git a/modules/management_master/README.md b/modules/management_master/README.md
index 78cdcb0..1e69722 100644
--- a/modules/management_master/README.md
+++ b/modules/management_master/README.md
@@ -28,7 +28,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/management_master"
-    version = "1.0.6"
+    version = "1.0.7"
     
     // VPC Configuration
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/mds/README.md b/modules/mds/README.md
index 1c154d1..92bc3a0 100755
--- a/modules/mds/README.md
+++ b/modules/mds/README.md
@@ -25,7 +25,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/mds"
-    version = "1.0.6"
+    version = "1.0.7"
     
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/mds/mds_userdata.yaml b/modules/mds/mds_userdata.yaml
index 11eee71..66cd999 100755
--- a/modules/mds/mds_userdata.yaml
+++ b/modules/mds/mds_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py sicKey=\"${SICKey}\" installationType=\"mds\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"mds\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" primary=\"${IsPrimary}\" secondary=\"${IsSecondary}\" adminSubnet=\"${AdminSubnet}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py sicKey=\"${SICKey}\" installationType=\"mds\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"mds\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" primary=\"${IsPrimary}\" secondary=\"${IsSecondary}\" adminSubnet=\"${AdminSubnet}\" bootstrapScript64=\"${BootstrapScript}\"
\ No newline at end of file
diff --git a/modules/mds_master/README.md b/modules/mds_master/README.md
index 20ecfb3..0abe0a2 100644
--- a/modules/mds_master/README.md
+++ b/modules/mds_master/README.md
@@ -26,7 +26,7 @@ provider "aws" {}
 
 module "mds_master" {
     source = "CheckPointSW/cloudguard-network-security/aws//modules/mds_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
   // --- VPC Network Configuration ---
   vpc_cidr = "10.0.0.0/16"
diff --git a/modules/standalone/README.md b/modules/standalone/README.md
index bc616b2..422524f 100755
--- a/modules/standalone/README.md
+++ b/modules/standalone/README.md
@@ -25,7 +25,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/standalone"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/standalone/standalone_userdata.yaml b/modules/standalone/standalone_userdata.yaml
index b4d727e..1458f03 100755
--- a/modules/standalone/standalone_userdata.yaml
+++ b/modules/standalone/standalone_userdata.yaml
@@ -1,4 +1,4 @@
 #cloud-config
 runcmd:
   - |
-    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" installationType=\"standalone\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.6\" templateName=\"standalone\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" adminSubnet=\"${AdminSubnet}\" allocatePublicAddress=\"${AllocateElasticIP}\" bootstrapScript64=\"${StandaloneBootstrapScript}\"
\ No newline at end of file
+    python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" installationType=\"standalone\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"1.0.7\" templateName=\"standalone\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" hostName=\"${Hostname }\" ntpPrimary=\"${NTPPrimary}\" ntpSecondary=\"${NTPSecondary}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" adminSubnet=\"${AdminSubnet}\" allocatePublicAddress=\"${AllocateElasticIP}\" bootstrapScript64=\"${StandaloneBootstrapScript}\"
\ No newline at end of file
diff --git a/modules/standalone_master/README.md b/modules/standalone_master/README.md
index 8b4a461..d85c5d9 100755
--- a/modules/standalone_master/README.md
+++ b/modules/standalone_master/README.md
@@ -33,7 +33,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/standalone_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/tgw_asg/README.md b/modules/tgw_asg/README.md
index d3d0696..b8e12f5 100755
--- a/modules/tgw_asg/README.md
+++ b/modules/tgw_asg/README.md
@@ -31,7 +31,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_asg"
-    version = "1.0.6"
+    version = "1.0.7"
     
     // --- Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/tgw_asg_master/README.md b/modules/tgw_asg_master/README.md
index 95912ef..62a8abe 100755
--- a/modules/tgw_asg_master/README.md
+++ b/modules/tgw_asg_master/README.md
@@ -34,7 +34,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_asg_master"
-    version = "1.0.6"
+    version = "1.0.7"
   
     // --- Network Configuration ---
     vpc_cidr = "10.0.0.0/16"
diff --git a/modules/tgw_cross_az_cluster/README.md b/modules/tgw_cross_az_cluster/README.md
index 1a4fa48..25d3d8c 100755
--- a/modules/tgw_cross_az_cluster/README.md
+++ b/modules/tgw_cross_az_cluster/README.md
@@ -25,7 +25,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_cross_az_cluster"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-1234"
diff --git a/modules/tgw_cross_az_cluster_master/README.md b/modules/tgw_cross_az_cluster_master/README.md
index 6a108c8..e88eddf 100755
--- a/modules/tgw_cross_az_cluster_master/README.md
+++ b/modules/tgw_cross_az_cluster_master/README.md
@@ -30,7 +30,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_cross_az_cluster_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
       // --- VPC Network Configuration ---
      vpc_cidr = "10.0.0.0/16"
diff --git a/modules/tgw_gwlb/README.md b/modules/tgw_gwlb/README.md
index ab8c2be..73f1d5f 100755
--- a/modules/tgw_gwlb/README.md
+++ b/modules/tgw_gwlb/README.md
@@ -32,7 +32,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_gwlb"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration ---
     vpc_id = "vpc-12345678"
diff --git a/modules/tgw_gwlb_master/README.md b/modules/tgw_gwlb_master/README.md
index b18b4ee..2b7887d 100755
--- a/modules/tgw_gwlb_master/README.md
+++ b/modules/tgw_gwlb_master/README.md
@@ -32,7 +32,7 @@ provider "aws" {}
 module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/aws//modules/tgw_gwlb_master"
-    version = "1.0.6"
+    version = "1.0.7"
 
     // --- VPC Network Configuration --
     vpc_cidr = "10.0.0.0/16"