diff --git a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
index f25b5b04..d3f535f2 100644
--- a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
+++ b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
@@ -18,10 +18,10 @@ cat /tls/*.pem > /etc/confluent/ca.pem
 /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
 profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/^profile: //')
 /opt/confluent/bin/apiclient /confluent-public/os/$profile/kickstart > /etc/confluent/ks.cfg
-/opt/confluent/bin/apiclient /confluent-public/os/$profile/scripts/makeksnet > /tmp/makeksnet
+/opt/confluent/bin/apiclient /confluent-public/os/$profile/scripts/makeksnet >> /etc/confluent/ks.cfg
 chmod +x /tmp/makeksnet
 /tmp/makeksnet > /tmp/ksnet
 rootpw=$(grep ^rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //')
-echo rootpw --iscrypted $rootpw > /tmp/rootuser
+echo rootpw --iscrypted $rootpw >> /etc/confluent/ks.cfg
 export BOOT_CMDLINE=ks=/etc/confluent/ks.cfg
 /bin/install
diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart
index e6dcbd5b..1ed0ce9b 100644
--- a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart
+++ b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart
@@ -1,5 +1,4 @@
 accepteula
+clearpart --firstdisk --preservevmfs
 install --firstdisk --preservevmfs
-%include /tmp/ksnet
-%include /tmp/rootuser
 reboot
diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py
index c41438eb..261c1d93 100644
--- a/confluent_server/confluent/osimage.py
+++ b/confluent_server/confluent/osimage.py
@@ -87,7 +87,6 @@ def update_boot_esxi(profiledir, profile, label):
             sourcefile = '{0}/distribution/{1}'.format(profiledir, fn.upper())
         os.symlink(sourcefile, '{0}/boot/{1}'.format(profiledir, fn))
     os.symlink('{0}/distribution/EFI/BOOT/BOOTX64.EFI'.format(profiledir), '{0}/boot/efi/boot/bootx64.efi'.format(profiledir))
-    os.symlink('{0}/distribution/EFI/BOOT/SAFEBOOT.EFI'.format(profiledir), '{0}/boot/efi/boot/safe.efi'.format(profiledir))
     subprocess.check_call(
         ['/opt/confluent/bin/dir2img', '{0}/boot'.format(profiledir),
          '{0}/boot.img'.format(profiledir)], preexec_fn=relax_umask)