diff --git a/README.md b/README.md
index 1e1f4b6..8be6705 100644
--- a/README.md
+++ b/README.md
@@ -295,6 +295,7 @@ slaves:
     host_healthcheck:		If true, enable the optional healthcheck container. See hosting healthchecks below
     lava-coordinator:		Does the slave should ran a lava-coordinator
     expose_ser2net:		Do ser2net ports need to be available on host
+    joblimit: x         Add a joblimit to the worker (default 0)
     custom_volumes:
       - "name:path"		Add a custom volume
     expose_ports:		Expose port p1 on the host to p2 on the worker slave.
diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh
index 9415260..5db73e1 100755
--- a/lava-slave/scripts/setup.sh
+++ b/lava-slave/scripts/setup.sh
@@ -72,6 +72,9 @@ do
 		lavacli $LAVACLIOPTS workers add --description "LAVA dispatcher on $(cat /root/phyhostname)" $worker || exit $?
 		# does we ran 2020.09+ and worker need a token
 	fi
+
+	lavacli $LAVACLIOPTS workers update --job-limit $LAVA_JOBLIMIT $worker || exit $?
+
 	grep -q "TOKEN" /root/entrypoint.sh
 	if [ $? -eq 0 ];then
 		# This is 2020.09+
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 4563c49..922ad52 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -549,6 +549,10 @@ def main():
             remote_proto = worker["remote_proto"]
         remote_uri = "%s://%s:%s@%s:%s/RPC2" % (remote_proto, remote_user, remote_token, remote_address, remote_rpc_port)
         remote_master_url = "%s://%s:%s" % (remote_proto, remote_address, remote_rpc_port)
+        joblimit = 0
+
+        if 'joblimit' in worker:
+            joblimit = worker['joblimit']
 
         fsetupenv = open("%s/setupenv" % workerdir, "a")
         fsetupenv.write("LAVA_MASTER_URI=%s\n" % remote_uri)
@@ -556,6 +560,7 @@ def main():
         fsetupenv.write("LAVA_MASTER_USER=%s\n" % remote_user)
         fsetupenv.write("LAVA_MASTER_BASEURI=%s://%s:%s/RPC2\n" % (remote_proto, remote_address, remote_rpc_port))
         fsetupenv.write("LAVA_MASTER_TOKEN=%s\n" % remote_token)
+        fsetupenv.write("LAVA_JOBLIMIT=%d\n" % joblimit)
         fsetupenv.close()
 
         if "lava-coordinator" in worker and worker["lava-coordinator"]: