diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index a3f25e6..3dce887 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -15,9 +15,6 @@ COPY scripts/ /usr/local/bin/
 RUN chmod a+x /usr/local/bin/*
 COPY conmux/ /etc/conmux/
 
-# LAVA issue 585
-RUN rm /etc/nbd-server/config
-
 # Caution to not use any port between the Linux dynamic port range: 32768-60999
 RUN find /usr/lib/python3/dist-packages/ -iname constants.py | xargs sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,'
 RUN find /usr/lib/python3/dist-packages/ -iname constants.py | xargs sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,'
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 859c6c8..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