diff --git a/src/loadgenerator/Dockerfile b/src/loadgenerator/Dockerfile
index be8e00b..a90c23e 100644
--- a/src/loadgenerator/Dockerfile
+++ b/src/loadgenerator/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.6
 
 COPY requirements.txt .
 RUN pip install -r requirements.txt
diff --git a/src/loadgenerator/loadgen.sh b/src/loadgenerator/loadgen.sh
index 40ddddf..5021e29 100755
--- a/src/loadgenerator/loadgen.sh
+++ b/src/loadgenerator/loadgen.sh
@@ -7,5 +7,4 @@ if [[ -z "${FRONTEND_ADDR}" ]]; then
 fi
 
 set -x
-# 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 
+locust --host="http://${FRONTEND_ADDR}" --no-web -c "${USERS:-10}"