diff --git a/base/systemd-presets/source/stx/systemd/traits/aio.preset b/base/systemd-presets/source/stx/systemd/traits/aio.preset
index e555d1cdb..a7bcf4170 100644
--- a/base/systemd-presets/source/stx/systemd/traits/aio.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/aio.preset
@@ -116,9 +116,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-enable guestServer.service
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
diff --git a/base/systemd-presets/source/stx/systemd/traits/controller.preset b/base/systemd-presets/source/stx/systemd/traits/controller.preset
index 34bbfb8a7..d38eae044 100644
--- a/base/systemd-presets/source/stx/systemd/traits/controller.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/controller.preset
@@ -119,10 +119,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-disable guestServer.service
-
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
diff --git a/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset b/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset
index e555d1cdb..a7bcf4170 100644
--- a/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset
@@ -116,9 +116,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-enable guestServer.service
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
diff --git a/base/systemd-presets/source/stx/systemd/traits/storage.preset b/base/systemd-presets/source/stx/systemd/traits/storage.preset
index d9e31da64..e54450e5e 100644
--- a/base/systemd-presets/source/stx/systemd/traits/storage.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/storage.preset
@@ -108,9 +108,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-disable guestServer.service
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
@@ -150,7 +147,6 @@ disable drbd.service
 disable fminit.service
 disable lighttpd.service
 disable memcached.service
-disable guestAgent.service
 disable slapd.service
 disable barbican-api.service
 disable barbican-keystone-listener.service
diff --git a/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset b/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset
index f82e2b20a..8fe5ee542 100644
--- a/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset
@@ -111,9 +111,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-enable guestServer.service
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
@@ -149,7 +146,6 @@ disable drbd.service
 disable fminit.service
 disable lighttpd.service
 disable memcached.service
-disable guestAgent.service
 disable slapd.service
 disable barbican-api.service
 disable barbican-keystone-listener.service
diff --git a/base/systemd-presets/source/stx/systemd/traits/worker.preset b/base/systemd-presets/source/stx/systemd/traits/worker.preset
index f82e2b20a..8fe5ee542 100644
--- a/base/systemd-presets/source/stx/systemd/traits/worker.preset
+++ b/base/systemd-presets/source/stx/systemd/traits/worker.preset
@@ -111,9 +111,6 @@ enable hostw.service
 enable pmon.service
 enable lmon.service
 
-# mtce-guest.spec
-enable guestServer.service
-
 # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO)
 #enable collect-engtools.service
 
@@ -149,7 +146,6 @@ disable drbd.service
 disable fminit.service
 disable lighttpd.service
 disable memcached.service
-disable guestAgent.service
 disable slapd.service
 disable barbican-api.service
 disable barbican-keystone-listener.service