diff --git a/hack/image-build-ova.py b/hack/image-build-ova.py
index 162d6c0..de5c159 100755
--- a/hack/image-build-ova.py
+++ b/hack/image-build-ova.py
@@ -178,7 +178,7 @@ def main():
 
     ovf = "%s-%s.ovf" % (build_data['build_name'], data['TYPED_VERSION'])
     mf = "%s-%s.mf" % (build_data['build_name'], data['TYPED_VERSION'])
-    ova = "%s-%s.ova" % (build_data['build_name'], data['TYPED_VERSION'])
+    ova = "%s-%s-%s.ova" % (build_data['build_name'], data['TYPED_VERSION'], "debug")
 
     # Create OVF
     create_ovf(ovf, data, ovf_template)
diff --git a/packer/ova/packer-node.json b/packer/ova/packer-node.json
index dfd8869..5999182 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 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
       "ssh_username": "{{user `ssh_username`}}",