diff --git a/.drone.yml b/.drone.yml
index 16cc0b9..27bd616 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,9 +6,6 @@ volumes:
 - name: output
   claim:
     name: flexvolsmb-drone-output
-- name: scratch
-  claim:
-    name: flexvolsmb-drone-scratch
 
 steps:
 - name: Debugging information
diff --git a/ansible/roles/custom/tasks/main.yml b/ansible/roles/custom/tasks/main.yml
index 80c8cd3..15ff220 100644
--- a/ansible/roles/custom/tasks/main.yml
+++ b/ansible/roles/custom/tasks/main.yml
@@ -4,3 +4,9 @@
     content: |
       # To update this file, run dpkg-reconfigure cloud-init
       datasource_list: [ VMware, None ]
+
+- name: Disable & mask networkd-wait-online
+  ansible.builtin.systemd:
+    name: systemd-networkd-wait-online
+    enabled: no
+    masked: yes
diff --git a/packer/ova/packer-node.json b/packer/ova/packer-node.json
index 5999182..9c197f6 100644
--- a/packer/ova/packer-node.json
+++ b/packer/ova/packer-node.json
@@ -234,7 +234,7 @@
       "type": "vsphere-iso",
       "username": "{{user `username`}}",
       "vcenter_server": "{{user `vcenter_server`}}",
-      "vm_name": "{{user `build_version`}}",
+      "vm_name": "{{user `build_version`}}-debug",
       "vm_version": "{{user `vmx_version`}}"
     },
     {