diff --git a/terraform/modules/autoscaler/main.tf b/terraform/modules/autoscaler/main.tf
index 523864a..8e7453b 100644
--- a/terraform/modules/autoscaler/main.tf
+++ b/terraform/modules/autoscaler/main.tf
@@ -54,7 +54,7 @@ resource "aws_autoscaling_group" "agents" {
     instances_distribution {
       on_demand_base_capacity                  = var.on_demand_base_capacity
       on_demand_percentage_above_base_capacity = var.on_demand_percentage_above_base_capacity
-      spot_allocation_strategy                 = "capacity-optimized"
+      spot_allocation_strategy                 = "price-capacity-optimized"
     }
 
     launch_template {
diff --git a/terraform/vars/tvm-ci-prod.auto.tfvars b/terraform/vars/tvm-ci-prod.auto.tfvars
index 69ead65..ff09b7d 100644
--- a/terraform/vars/tvm-ci-prod.auto.tfvars
+++ b/terraform/vars/tvm-ci-prod.auto.tfvars
@@ -35,7 +35,7 @@ autoscaler_types = {
     labels                                   = "CPU"
     min_size                                 = 0
     max_size                                 = 90
-    on_demand_percentage_above_base_capacity = 100
+    on_demand_percentage_above_base_capacity = 30
     on_demand_base_capacity                  = 0
   }
   "Prod-Autoscaler-Jenkins-CPU-SPOT" = {
@@ -44,7 +44,7 @@ autoscaler_types = {
     labels                                   = "CPU-SPOT"
     min_size                                 = 0
     max_size                                 = 90
-    on_demand_percentage_above_base_capacity = 0
+    on_demand_percentage_above_base_capacity = 30
     on_demand_base_capacity                  = 0
   }
   "Prod-Autoscaler-Jenkins-CPU-Small" = {
@@ -62,7 +62,7 @@ autoscaler_types = {
     labels                                   = "CPU-SMALL-SPOT"
     min_size                                 = 0
     max_size                                 = 100
-    on_demand_percentage_above_base_capacity = 0
+    on_demand_percentage_above_base_capacity = 30
     on_demand_base_capacity                  = 0
   }
   "Prod-Autoscaler-Jenkins-GPU" = {
@@ -81,7 +81,7 @@ autoscaler_types = {
      labels                                   = "GPU-SPOT"
      min_size                                 = 8
      max_size                                 = 64
-     on_demand_percentage_above_base_capacity = 0
+     on_demand_percentage_above_base_capacity = 30
      on_demand_base_capacity                  = 0
      additional_instance_types                = ["g5.2xlarge", "g5.4xlarge", "g6.xlarge", "g6.2xlarge", "g6.4xlarge"]
    }
@@ -109,7 +109,7 @@ autoscaler_types = {
     labels                                     = "ARM-GRAVITON3-SPOT"
     min_size                                   = 0
     max_size                                   = 90
-    on_demand_percentage_above_base_capacity   = 0
+    on_demand_percentage_above_base_capacity   = 30
     on_demand_base_capacity                    = 0
   }
 }