diff --git a/harmonic/scripts/harmonic-install-scripts/harmonic.service b/harmonic/scripts/harmonic-install-scripts/harmonic.service
index 71cdb9f..3cece6d 100755
--- a/harmonic/scripts/harmonic-install-scripts/harmonic.service
+++ b/harmonic/scripts/harmonic-install-scripts/harmonic.service
@@ -8,7 +8,7 @@ Wants=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=/opt/harmonic-install-setup.sh
+ExecStart=/opt/harmonic.service.sh
 RemainAfterExit=true
 KillMode=process
 TasksMax=infinity
diff --git a/harmonic/scripts/harmonic-install-scripts/harmonic-installer-bootstrap.sh b/harmonic/scripts/harmonic-install-scripts/harmonic.service.sh
similarity index 62%
rename from harmonic/scripts/harmonic-install-scripts/harmonic-installer-bootstrap.sh
rename to harmonic/scripts/harmonic-install-scripts/harmonic.service.sh
index 4ba8f64..1cb47ac 100755
--- a/harmonic/scripts/harmonic-install-scripts/harmonic-installer-bootstrap.sh
+++ b/harmonic/scripts/harmonic-install-scripts/harmonic.service.sh
@@ -2,15 +2,15 @@
 
 echo "====================================================================================="
 echo "Harmonic Installer: Setup"
+echo "====================================================================================="
 echo "Harmonic Installer: Download 'harmonic-installer.sh' from Artifactory"
 wget https://artifactory.charterlab.com:443/artifactory/upload/harmonic/scripts/harmonic-installer.sh -O /opt/harmonic-installer.sh
 chmod +x /opt/harmonic-installer.sh
+echo "====================================================================================="
 echo "Harmonic Installer: Running"
 /opt/harmonic-installer.sh -vip
+echo "====================================================================================="
 echo "Harmonic Installer: Complete"
+echo "====================================================================================="
 echo "Harmonic Installer: Rebooting System"
-systemctl --message="Harmonic Post-Install Reboot" reboot
-echo "======================================================================================"
-
-
-
+systemctl --message="Harmonic Post-Install Reboot" reboot
\ No newline at end of file
diff --git a/harmonic/scripts/harmonic-install-scripts/user-data-runcmd.yaml b/harmonic/scripts/harmonic-install-scripts/user-data-runcmd.yaml
index 9cf1486..c7a1094 100755
--- a/harmonic/scripts/harmonic-install-scripts/user-data-runcmd.yaml
+++ b/harmonic/scripts/harmonic-install-scripts/user-data-runcmd.yaml
@@ -3,20 +3,22 @@ users:
   - name: ubuntu
     lock_passwd: False
     password: $6$canonical.$0zWaW71A9ke9ASsaOcFTdQ2tx1gSmLxMPrsH0rF0Yb.2AEKNPV1lrF94n6YuPJmnUy2K2/JSDtxuiBDey6Lpa/
-ssh_redirect_user: False
-ssh_pwauth: True
+    ssh_redirect_user: False
+    ssh_pwauth: True
 disable_root: False
 preserve_hostname: False
 runcmd:
-  - echo "---------------- Harmonic Installer - Fix root authorized_keys  -----------------"
-  - sudo sed -r -i 's/^.+(ssh-.+)$/\1/' /root/.ssh/authorized_keys  
-  - echo "---------------- Harmonic Installer - Create working directory -----------------"
-  - echo "---------------- Harmonic Installer - Install Script (DOWNLOAD) -----------------"
+  - echo "====================================================================================="
+  - echo "Harmonic Installer: Setup"
+  - echo "====================================================================================="
+  - echo "Harmonic Installer: Download 'harmonic-installer.sh' from Artifactory"
   - sudo wget https://artifactory.charterlab.com:443/artifactory/upload/harmonic/scripts/harmonic-installer.sh -O /opt/harmonic-installer.sh
   - sudo chmod +x /opt/harmonic-installer.sh
-  - echo "---------------- Harmonic Installer - Install Script (RUNNING) -----------------"
+  - echo "====================================================================================="
+  - echo "Harmonic Installer: Running"
   - sudo /opt/harmonic-installer.sh -vip
-  - echo "------------------- Harmonic Installer - Install Script (COMPLETED) ------------------"
-  - sudo wget --no-proxy {{ node_disable_pxe_url | escape.json }} --post-data {{ node_disable_pxe_data|escape.json }} -O /dev/null || true
-  - echo "------------------- Harmonic Installer - Rebooting System ------------------"
-  - sudo systemctl --message="Harmonic Post-Install Reboot" reboot
+  - echo "====================================================================================="
+  - echo "Harmonic Installer: Complete"
+  - echo "====================================================================================="
+  - echo "Harmonic Installer: Rebooting System"
+  - sudo systemctl --message="Harmonic Post-Install Reboot" reboot
\ No newline at end of file
diff --git a/harmonic/scripts/iso-builders/apollo-customize-and-rebuild.sh b/harmonic/scripts/iso-builders/apollo-customize-and-rebuild.sh
index d15e75b..f4af011 100755
--- a/harmonic/scripts/iso-builders/apollo-customize-and-rebuild.sh
+++ b/harmonic/scripts/iso-builders/apollo-customize-and-rebuild.sh
@@ -232,7 +232,7 @@ EOG
 
     xorriso -as mkisofs \
       -r -V "ubuntu" \
-      -J -joliet-long -l -cache-inodes \
+      -l -cache-inodes \
       -b isolinux/isolinux.bin \
       -c isolinux/boot.cat \
       -no-emul-boot -boot-load-size 4 -boot-info-table \