diff --git a/ic-os/components/hostos-scripts/guestos/guestos.service b/ic-os/components/hostos-scripts/guestos/guestos.service
index 9f49a5cfd76..36b46864b4e 100644
--- a/ic-os/components/hostos-scripts/guestos/guestos.service
+++ b/ic-os/components/hostos-scripts/guestos/guestos.service
@@ -6,13 +6,13 @@ Requires=generate-guestos-config.service
 After=generate-guestos-config.service
 
 [Service]
-Type=forking
+Type=oneshot
+RemainAfterExit=true
 ExecStartPre=/opt/ic/bin/detect-first-boot.sh
 ExecStart=/opt/ic/bin/start-guestos.sh
 ExecStartPost=/opt/ic/bin/manageboot.sh hostos confirm
 ExecStop=/opt/ic/bin/stop-guestos.sh
 Restart=on-failure
-PIDFile=/var/run/libvirt/qemu/guestos.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ic-os/components/hostos-scripts/guestos/start-guestos.sh b/ic-os/components/hostos-scripts/guestos/start-guestos.sh
index 42984a760d7..6ea11d3f67e 100755
--- a/ic-os/components/hostos-scripts/guestos/start-guestos.sh
+++ b/ic-os/components/hostos-scripts/guestos/start-guestos.sh
@@ -67,28 +67,10 @@ function start_guestos() {
     fi
 }
 
-function enable_guestos() {
-    if [ "$(virsh list --autostart | grep 'guestos')" ]; then
-        write_log "GuestOS virtual machine is already enabled."
-        write_metric "hostos_guestos_service_enable" \
-            "0" \
-            "GuestOS virtual machine enable state" \
-            "gauge"
-    else
-        virsh autostart guestos
-        write_log "Enabling GuestOS virtual machine."
-        write_metric "hostos_guestos_service_enable" \
-            "1" \
-            "GuestOS virtual machine enable state" \
-            "gauge"
-    fi
-}
-
 function main() {
     # Establish run order
     define_guestos
     start_guestos
-    enable_guestos
 }
 
 main
diff --git a/ic-os/components/hostos-scripts/guestos/stop-guestos.sh b/ic-os/components/hostos-scripts/guestos/stop-guestos.sh
index 5e299535cd9..bd8ea61535c 100755
--- a/ic-os/components/hostos-scripts/guestos/stop-guestos.sh
+++ b/ic-os/components/hostos-scripts/guestos/stop-guestos.sh
@@ -46,27 +46,9 @@ function stop_guestos() {
     fi
 }
 
-function disable_guestos() {
-    if [ "$(virsh list --autostart | grep 'guestos')" ]; then
-        virsh autostart --disable guestos
-        write_log "Disabling GuestOS virtual machine."
-        write_metric "hostos_guestos_service_disable" \
-            "1" \
-            "GuestOS virtual machine disable state" \
-            "gauge"
-    else
-        write_log "GuestOS virtual machine is already disabled."
-        write_metric "hostos_guestos_service_disable" \
-            "0" \
-            "GuestOS virtual machine disable state" \
-            "gauge"
-    fi
-}
-
 function main() {
     # Establish run order
     stop_guestos
-    disable_guestos
 }
 
 main