diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml
index f87de22..87a8896 100644
--- a/kubernetes-manifests/loadgenerator.yaml
+++ b/kubernetes-manifests/loadgenerator.yaml
@@ -32,8 +32,8 @@ spec:
           value: "10"
         resources:
           requests:
-            cpu: 100m
-            memory: 64Mi
+            cpu: 300m
+            memory: 256Mi
           limits:
-            cpu: 200m
-            memory: 128Mi
+            cpu: 500m
+            memory: 512Mi
diff --git a/src/loadgenerator/loadgen.sh b/src/loadgenerator/loadgen.sh
index 5021e29..40ddddf 100755
--- a/src/loadgenerator/loadgen.sh
+++ b/src/loadgenerator/loadgen.sh
@@ -7,4 +7,5 @@ if [[ -z "${FRONTEND_ADDR}" ]]; then
 fi
 
 set -x
-locust --host="http://${FRONTEND_ADDR}" --no-web -c "${USERS:-10}"
+# add "timeout 3600" because locust locks up/freezes for some reason
+timeout 3600 locust --host="http://${FRONTEND_ADDR}" --no-web -c "${USERS:-10}" -r 10