diff --git a/.drone.yml b/.drone.yml
index bb0f4fa..16cc0b9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,12 +22,6 @@ steps:
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
-  - |
-    apt-get update
-  - |
-    apt-get install -y \
-      curl \
-      make
   - |
     jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \
     mv /tmp/vsphere.json ./packer/ova/vsphere.json
diff --git a/packer/config/common.json b/packer/config/common.json
index a243257..73eef54 100644
--- a/packer/config/common.json
+++ b/packer/config/common.json
@@ -1,7 +1,7 @@
 {
   "build_target": "virt",
   "disable_public_repos": "false",
-  "extra_debs": "open-iscsi",
+  "extra_debs": "nfs-common open-iscsi",
   "extra_repos": "",
   "extra_rpms": "",
   "firstboot_custom_roles_post": "",
diff --git a/packer/ova/packer-node.json b/packer/ova/packer-node.json
index 5999182..dfd8869 100644
--- a/packer/ova/packer-node.json
+++ b/packer/ova/packer-node.json
@@ -221,7 +221,7 @@
         }
       ],
       "password": "{{user `password`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
       "ssh_username": "{{user `ssh_username`}}",