diff --git a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
index 24314ce66..0ae622205 100644
--- a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
+++ b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
@@ -151,6 +151,44 @@ resource "aws_lambda_function" "jitprovisioner" {
   }
 }
 
+module "jitprovisioner-lambda-warmer" {
+  source        = "Nuagic/lambda-warmer/aws"
+  version       = "3.0.1"
+  function_name = aws_lambda_function.jitprovisioner.function_name
+  function_arn  = aws_lambda_function.jitprovisioner.arn
+# This just needs to have a request to parse.
+  input         = <<EOINPUT
+{
+    "requestContext": {
+        "elb": {
+            "targetGroupArn": "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-279XGJDqGZ5rsrHC2Fjr/49e9d65c45c6791a"
+        }
+    },
+    "httpMethod": "GET",
+    "path": "/health",
+    "queryStringParameters": {
+        "query": "1234ABCD"
+    },
+    "multiValueHeaders": {
+        "accept": ["text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"],
+        "accept-encoding": ["gzip"],
+        "accept-language": ["en-US,en;q=0.9"],
+        "connection": ["keep-alive"],
+        "host": ["lambda-alb-123578498.us-east-2.elb.amazonaws.com"],
+        "upgrade-insecure-requests": ["1"],
+        "user-agent": ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"],
+        "x-amzn-trace-id": ["Root=1-5c536348-3d683b8b04734faae651f476"],
+        "x-forwarded-for": ["72.12.164.125"],
+        "x-forwarded-port": ["80"],
+        "x-forwarded-proto": ["http"],
+        "x-imforwards": ["20"]
+    },
+    "body": "",
+    "isBase64Encoded": false
+}
+EOINPUT
+}
+
 resource "random_password" "authorization" {
   length  = 16
   special = false
diff --git a/infrastructure/sandbox/Monitoring/main.tf b/infrastructure/sandbox/Monitoring/main.tf
index a27bf94e6..8760b41b5 100644
--- a/infrastructure/sandbox/Monitoring/main.tf
+++ b/infrastructure/sandbox/Monitoring/main.tf
@@ -215,7 +215,7 @@ resource "aws_cloudwatch_metric_alarm" "unclaimed" {
   namespace           = "Fleet/sandbox"
   period              = "900"
   statistic           = "Average"
-  threshold           = "10"
+  threshold           = "5"
   alarm_actions       = [module.notify_slack.slack_topic_arn]
   ok_actions          = [module.notify_slack.slack_topic_arn]
   treat_missing_data  = "breaching"
diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/fleet/templates/deployment.yaml b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/fleet/templates/deployment.yaml
index 5d443b320..39ef4e3b3 100644
--- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/fleet/templates/deployment.yaml
+++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/fleet/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
           - name: FLEET_SERVER_SANDBOX_ENABLED
             value: "1"
           - name: FLEET_VULNERABILITIES_PERIODICITY
-            value: "5m"
+            value: "15m"
           - name: FLEET_LICENSE_ENFORCE_HOST_LIMIT
             value: "true"
           - name: FLEET_VULNERABILITIES_DATABASES_PATH
diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
index c1fb02d27..487f78b9c 100644
--- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
+++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
@@ -157,7 +157,7 @@ resource "helm_release" "main" {
 
   set {
     name  = "imageTag"
-    value = "v4.26.0"
+    value = "v4.26.0-1"
   }
 
   set {
diff --git a/infrastructure/sandbox/PreProvisioner/main.tf b/infrastructure/sandbox/PreProvisioner/main.tf
index 44c550581..d86caed3e 100644
--- a/infrastructure/sandbox/PreProvisioner/main.tf
+++ b/infrastructure/sandbox/PreProvisioner/main.tf
@@ -257,7 +257,7 @@ resource "aws_ecs_task_definition" "main" {
           },
           {
             name  = "QUEUED_INSTANCES"
-            value = "20"
+            value = "10"
           },
           {
             name  = "TF_VAR_redis_address"
diff --git a/infrastructure/sandbox/tools/upgrade_unclaimed.sh b/infrastructure/sandbox/tools/upgrade_unclaimed.sh
index ccfab94e0..9daf57681 100755
--- a/infrastructure/sandbox/tools/upgrade_unclaimed.sh
+++ b/infrastructure/sandbox/tools/upgrade_unclaimed.sh
@@ -53,16 +53,25 @@ export TF_VAR_mysql_secret="arn:aws:secretsmanager:us-east-2:411315989055:secret
 
 terraform init -backend-config=backend.conf
 
+EXPECTED_UNCLAIMED_INSTANCES=10
 PREPROVISIONER_TASK_DEFINITION_ARN="$(aws ecs list-task-definitions | jq -r '.taskDefinitionArns[] | select(contains("sandbox-prod-preprovisioner"))')"
 UNCLAIMED_INSTANCES="$(get_unclaimed_instances)"
+UNCLAIMED_ARRAY=( ${UNCLAIMED_INSTANCES} )
 
-# From the 11th and on.
-ALL_BUT_TEN="$(tail -n +11 <<<"${UNCLAIMED_INSTANCES}")"
+HALF_ROUND_DOWN="${UNCLAIMED_ARRAY[@]::$((${#UNCLAIMED_ARRAY[@]} / 2))}"
 
-purge_instances "${ALL_BUT_TEN:?}"
+purge_instances "${HALF_ROUND_DOWN:?}"
 
 provision_new_instances
 
+# If something went wrong, don't let us continue with way too few unclaimed instances
+NEW_UNCLAIMED="$(get_unclaimed_instances | wc -w)"
+if [ ${NEW_UNCLAIMED:?} -lt ${EXPECTED_UNCLAIMED_INSTANCES:?} ]; then
+	echo "Only ${NEW_UNCLAIMED:?} instances found, ${EXPECTED_UNCLAIMED_INSTANCES:?} expected.  Press ENTER to continue or CTRL-C to abort."
+	read
+fi
+
+# Get a fresh unclaimed as close to runtime as possible to reduce risk of deleting a claimed instance.
 REMAINING_UNCLAIMED="$(comm -12 <(get_unclaimed_instances) <(echo "${UNCLAIMED_INSTANCES:?}"))"
 
 purge_instances "${REMAINING_UNCLAIMED:?}"