diff --git a/packer/preseed/UbuntuServer20.04/user-data b/packer/preseed/UbuntuServer20.04/user-data
index 7b60433..27b65cd 100644
--- a/packer/preseed/UbuntuServer20.04/user-data
+++ b/packer/preseed/UbuntuServer20.04/user-data
@@ -1,7 +1,9 @@
 #cloud-config
 autoinstall:
   version: 1
-  locale: en_US
+  early-commands:
+    # Block inbound SSH to stop Packer trying to connect during initial install
+    - iptables -A INPUT -p tcp --dport 22 -j DROP  locale: en_US
   keyboard:
     layout: en
     variant: us
@@ -16,7 +18,7 @@ autoinstall:
       name: lvm
   identity:
     hostname: packer-template
-    username: root
+    username: ubuntu
     password: <<ssh-password>>
   ssh:
     install-server: yes
@@ -25,5 +27,5 @@ autoinstall:
 #      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCi9eAu6KBaShdcL4pxi6/sJp+IS6nCKexcjQdwFLxg+EoiT2MTAnMsjnfi570het+VV+iOigcZLuRwEcAPh6rSQOtpikmpV6WFjzToWq9aUxDrxWsp/iEPHp+sbjrlsdnGvLGY9XhmPs9s5I8xFQbwF6ilhMIQm+RxtGJJuPUWaF+uXo+3CB91A6bK/rjs97iAjrPZRs0vo5hJGqrIGFi3WP9hf8hF9oWz2BiLRYBib3il6lsAl4Ca0sI//gNM0Ztj4gB7qv1+uPz157bk0IZoN285/72l/rUZVSPIwO+QFZFK07FsyVrpAgMlHk65BiSAO4DtolZEArfXRE1g1DH/ mail@example.com
   user-data:
     disable_root: false
-#  late-commands:
-#    - echo 'ubnt ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/ubuntu
+  late-commands:
+    - echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/ubuntu
diff --git a/packer/ubuntuserver20.04.pkr.hcl b/packer/ubuntuserver20.04.pkr.hcl
index a8ce1c9..5deb352 100644
--- a/packer/ubuntuserver20.04.pkr.hcl
+++ b/packer/ubuntuserver20.04.pkr.hcl
@@ -26,9 +26,11 @@ source "vsphere-iso" "ubuntuserver" {
   boot_wait               = "2s"
   
   communicator            = "ssh"
-  ssh_username            = "root"
+  ssh_username            = "ubuntu"
   ssh_password            = var.ssh_password
-  ssh_timeout             = "10m"
+  ssh_timeout             = "20m"
+  ssh_handshake_attempts  = "100"
+  ssh_pty                 = true
   
   CPUs                    = 2
   RAM                     = 4096