diff --git a/.github/workflows/loadtest-osquery-perf.yml b/.github/workflows/loadtest-osquery-perf.yml
index 7c7e89b15d..d383db0a7d 100644
--- a/.github/workflows/loadtest-osquery-perf.yml
+++ b/.github/workflows/loadtest-osquery-perf.yml
@@ -13,7 +13,7 @@ on:
         default: "main"
         required: true
       loadtest_containers:
-        description: "Deploys osquery-perf containers all at once. Total number of osquery-perf tasks to run (should be a multiple of 8, if setting loadtest_containers_starting_index). This is also used as the end index in enroll.sh"
+        description: "Deploys osquery-perf containers all at once. Total number of osquery-perf tasks to run. This is also used as the end index in enroll.sh"
         type: string
         required: true
       loadtest_containers_starting_index:
@@ -22,7 +22,7 @@ on:
         default: 0
         required: true
       task_size:
-        description: "CPU and Memory setting for osquery-perf containers. Example: {\"cpu\":\"4098\",\"memory\":\"8192\"}"
+        description: "CPU and Memory setting for osquery-perf containers. Example: {\"cpu\":\"4096\",\"memory\":\"8192\"}"
         type: string
         default: "{\"cpu\":\"4096\",\"memory\":\"8192\"}"
         required: true
diff --git a/infrastructure/loadtesting/terraform/osquery_perf/enroll.sh b/infrastructure/loadtesting/terraform/osquery_perf/enroll.sh
index 983a57de89..ce268964ea 100755
--- a/infrastructure/loadtesting/terraform/osquery_perf/enroll.sh
+++ b/infrastructure/loadtesting/terraform/osquery_perf/enroll.sh
@@ -32,6 +32,11 @@ fi
 set -x
 
 for (( c=$START_INDEX; c<=$END_INDEX; c+=$INCREMENT )); do
-        terraform apply -var git_tag_branch=$BRANCH_NAME -var task_size="$TASK_SIZE" -var loadtest_containers=$c -auto-approve
+    terraform apply -var git_tag_branch=$BRANCH_NAME -var task_size="$TASK_SIZE" -var loadtest_containers=$c -auto-approve
 	sleep $SLEEP_TIME_SECONDS
 done
+
+# Apply the remainder if the loop didn't land exactly on END_INDEX.
+if (( $c - $INCREMENT != $END_INDEX )); then
+	terraform apply -var git_tag_branch=$BRANCH_NAME -var task_size="$TASK_SIZE" -var loadtest_containers=$END_INDEX -auto-approve
+fi