diff --git a/systemd/dde-session@wayland.service b/systemd/dde-session@wayland.service
index 9ce30ba..bcd6ea5 100644
--- a/systemd/dde-session@wayland.service
+++ b/systemd/dde-session@wayland.service
@@ -18,8 +18,7 @@ PartOf=graphical-session.target
 
 [Service]
 Slice=session.slice
-BusName=org.kde.KWinWrapper
-Type=dbus
+Type=simple
 # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
 #       the [Unit] section with systemd >= 246. Also, the current solution is
 #       kind of painful as systemd had a bug where it retries the condition.
@@ -36,3 +35,4 @@ ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemct
 Restart=no
 # Kill any stubborn child processes after this long
 TimeoutStopSec=5
+TimeoutStartSec=infinity
diff --git a/systemd/dde-session@x11.service b/systemd/dde-session@x11.service
index e4baf10..7a91e99 100644
--- a/systemd/dde-session@x11.service
+++ b/systemd/dde-session@x11.service
@@ -22,8 +22,7 @@ StartLimitBurst=1
 
 [Service]
 Slice=session.slice
-BusName=org.kde.KWin
-Type=dbus
+Type=simple
 # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
 #       the [Unit] section with systemd >= 246. Also, the current solution is
 #       kind of painful as systemd had a bug where it retries the condition.
@@ -41,3 +40,4 @@ Restart=always
 RestartSec=0ms
 # Kill any stubborn child processes after this long
 TimeoutStopSec=5
+TimeoutStartSec=infinity