diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index d309432..db81b69 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM lavasoftware/lava-server:2022.11.1
+FROM lavasoftware/lava-server:2023.01
 
 RUN apt-get update && apt-get -y install sudo git
 
diff --git a/lava-master/entrypoint.d/01_setup.sh b/lava-master/entrypoint.d/01_setup.sh
index 459e0e0..b0b9383 100755
--- a/lava-master/entrypoint.d/01_setup.sh
+++ b/lava-master/entrypoint.d/01_setup.sh
@@ -16,6 +16,9 @@ else
 	sed -i "s,PASSWORD:.*,PASSWORD: '$(cat /root/pg_lava_password)'," /etc/lava-server/settings.d/00-database.yaml || exit $?
 fi
 
+cd /root/
+lava-server manage makemigrations || exit $?
+
 # verify that the backup was not already applied in case of persistent_db
 if [ ! -e "/var/lib/postgresql/lava-docker.backup_done" ];then
 	if [ -e /root/backup/db_lavaserver.gz ];then
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 8bb892e..3dce887 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -1,4 +1,4 @@
-FROM lavasoftware/lava-dispatcher:2022.11.1
+FROM lavasoftware/lava-dispatcher:2023.01
 
 RUN apt-get update
 
diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh
index cc2de30..9415260 100755
--- a/lava-slave/scripts/setup.sh
+++ b/lava-slave/scripts/setup.sh
@@ -148,7 +148,7 @@ do
 			if [ $? -ne 0 ]; then
 				CURR_WORKER=""
 			else
-				CURR_WORKER=$(cat /tmp/current-worker | sed '^.* ,,')
+				CURR_WORKER=$(cat /tmp/current-worker | sed 's,^.* ,,')
 			fi
 			if [ ! -z "$CURR_WORKER" -a "$CURR_WORKER" != "$worker" ];then
 				echo "ERROR: $devicename already present on another worker $CURR_WORKER"
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 6f0a86f..a0a082e 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -602,7 +602,8 @@ def main():
         if use_nbd:
             dockcomp["services"][name]["ports"].append("61950-62000:61950-62000")
             fp = open("%s/scripts/extra_actions" % workerdir, "a")
-            fp.write("apt-get -y install nbd-server\n")
+            # LAVA issue 585 need to remove /etc/nbd-server/config
+            fp.write("apt-get -y install nbd-server && rm -f /etc/nbd-server/config\n")
             fp.close()
             os.chmod("%s/scripts/extra_actions" % workerdir, 0o755)
         use_overlay_server = True
@@ -683,6 +684,10 @@ def main():
         if devicetype == "qemu" and not use_kvm:
             device_line += "{% set no_kvm = True %}\n"
         if "uart" in board:
+            keywords_uart = [ "baud", "devpath", "idproduct", "idvendor", "interfacenum", "serial", "use_ser2net", "worker" ]
+            for keyword in board["uart"]:
+                if not keyword in keywords_uart:
+                    print("WARNING: unknown keyword %s" % keyword)
             uart = board["uart"]
             baud = board["uart"].get("baud", baud_default)
             idvendor = board["uart"]["idvendor"]