diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf
index bb9d17b4..47192731 100644
--- a/examples/aws/installation/dsf_single_account_deployment/variables.tf
+++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf
@@ -253,7 +253,7 @@ variable "hub_instance_type" {
 
 variable "agentless_gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/examples/aws/installation/sonar_multi_account_deployment/variables.tf b/examples/aws/installation/sonar_multi_account_deployment/variables.tf
index 223f7be5..29354683 100644
--- a/examples/aws/installation/sonar_multi_account_deployment/variables.tf
+++ b/examples/aws/installation/sonar_multi_account_deployment/variables.tf
@@ -203,7 +203,7 @@ variable "hub_instance_type" {
 
 variable "gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the DSF gw"
 }
 
diff --git a/examples/aws/installation/sonar_single_account_deployment/variables.tf b/examples/aws/installation/sonar_single_account_deployment/variables.tf
index f205c72a..c36cc8d3 100644
--- a/examples/aws/installation/sonar_single_account_deployment/variables.tf
+++ b/examples/aws/installation/sonar_single_account_deployment/variables.tf
@@ -150,7 +150,7 @@ variable "hub_instance_type" {
 
 variable "gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf
index 632e1a1a..43130cbd 100644
--- a/examples/aws/poc/dsf_deployment/variables.tf
+++ b/examples/aws/poc/dsf_deployment/variables.tf
@@ -246,13 +246,13 @@ variable "agentless_gw_hadr" {
 
 variable "hub_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the DSF Hub"
 }
 
 variable "agentless_gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/examples/aws/poc/sonar_basic_deployment/variables.tf b/examples/aws/poc/sonar_basic_deployment/variables.tf
index 0b756b92..bdeb4120 100644
--- a/examples/aws/poc/sonar_basic_deployment/variables.tf
+++ b/examples/aws/poc/sonar_basic_deployment/variables.tf
@@ -94,13 +94,13 @@ variable "subnet_ids" {
 
 variable "hub_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the DSF Hub"
 }
 
 variable "agentless_gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/examples/aws/poc/sonar_hadr_deployment/variables.tf b/examples/aws/poc/sonar_hadr_deployment/variables.tf
index 5107852b..283b6389 100644
--- a/examples/aws/poc/sonar_hadr_deployment/variables.tf
+++ b/examples/aws/poc/sonar_hadr_deployment/variables.tf
@@ -110,13 +110,13 @@ variable "subnet_ids" {
 
 variable "hub_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the DSF Hub"
 }
 
 variable "agentless_gw_instance_type" {
   type        = string
-  default     = "r6i.xlarge"
+  default     = "r6i.2xlarge"
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/modules/aws/agentless-gw/variables.tf b/modules/aws/agentless-gw/variables.tf
index 6e062a6a..4d94f42d 100644
--- a/modules/aws/agentless-gw/variables.tf
+++ b/modules/aws/agentless-gw/variables.tf
@@ -97,7 +97,7 @@ variable "use_public_ip" {
 
 variable "instance_type" { # https://docs.imperva.com/bundle/z-kb-articles-km/page/a6defd0e.html
   type        = string
-  default     = "r6i.xlarge" # 4 cores & 32GB ram
+  default     = "r6i.2xlarge" # 8 cores & 64GB ram
   description = "Ec2 instance type for the Agentless Gateway"
 }
 
diff --git a/modules/aws/sonar-base-instance/setup.tftpl b/modules/aws/sonar-base-instance/setup.tftpl
index 757f83c9..31ebe611 100644
--- a/modules/aws/sonar-base-instance/setup.tftpl
+++ b/modules/aws/sonar-base-instance/setup.tftpl
@@ -92,7 +92,7 @@ function create_lvm() {
     # Create logical volumes with lowercase names
     lvcreate --name logs -L 20G $volume_group_name
     lvcreate --name local -L 20G $volume_group_name
-    lvcreate --name apps -L 30G $volume_group_name
+    lvcreate --name apps -L 40G $volume_group_name
     lvcreate -l 100%FREE --name data $volume_group_name
 
     # Format the logical volumes with desired filesystem (e.g., xfs)