diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 236c53a4..0478a6fa 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM lavasoftware/lava-server:2024.01
+FROM lavasoftware/lava-server:2024.05
 
 RUN apt-get update && apt-get -y install sudo git
 
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 64a4ac54..df3880cc 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -1,4 +1,4 @@
-FROM lavasoftware/lava-dispatcher:2024.01
+FROM lavasoftware/lava-dispatcher:2024.05
 
 RUN apt-get update
 
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 7dcb45f7..8832fab6 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -147,7 +147,7 @@ def main():
         else:
             listen_address = '0.0.0.0'
         dockcomp = {}
-        dockcomp["version"] = "2.0"
+        dockcomp["version"] = "2.4"
         dockcomp["services"] = {}
         dockcomposeymlpath = "output/%s/docker-compose.yml" % host
         dockcomp["services"][name] = {}