diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 4d17a74..0f085ad 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -268,9 +268,3 @@ for_window [app_id="pavucontrol"] floating enable
 # Start the systemd-user target for sway and import environment
 # Makes service management a bit cleaner
 exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
-
-exec nm-applet --indicator
-exec blueman-applet
-exec mako --config ~/.config/mako/mako.conf
-exec fcitx5
-exec_always nwg-drawer -r
diff --git a/sway/.config/systemd/user/blueman-applet.service b/sway/.config/systemd/user/blueman-applet.service
new file mode 100644
index 0000000..a192376
--- /dev/null
+++ b/sway/.config/systemd/user/blueman-applet.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Bluetooth Manager Applet
+BindsTo=sway-session.target
+
+[Service]
+ExecStart=blueman-applet
+
+[Install]
+WantedBy=sway-session.target
diff --git a/sway/.config/systemd/user/fcitx5.service b/sway/.config/systemd/user/fcitx5.service
new file mode 100644
index 0000000..dd69306
--- /dev/null
+++ b/sway/.config/systemd/user/fcitx5.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Fcitx5 Input Method Daemon
+BindsTo=sway-session.target
+
+[Service]
+ExecStart=fcitx5
+
+[Install]
+WantedBy=sway-session.target
diff --git a/sway/.config/systemd/user/mako.service b/sway/.config/systemd/user/mako.service
new file mode 100644
index 0000000..219783e
--- /dev/null
+++ b/sway/.config/systemd/user/mako.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Mako Notification Daemon
+BindsTo=sway-session.target
+
+[Service]
+Type=simple
+ExecStart=mako --config %h/.config/mako/mako.conf
+
+[Install]
+WantedBy=sway-session.target
diff --git a/sway/.config/systemd/user/nm-indicator.service b/sway/.config/systemd/user/nm-indicator.service
new file mode 100644
index 0000000..843eb57
--- /dev/null
+++ b/sway/.config/systemd/user/nm-indicator.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Indicator for NetworkManager
+BindsTo=sway-session.target
+
+[Service]
+Type=simple
+ExecStart=nm-applet --indicator
+
+[Install]
+WantedBy=sway-session.target
diff --git a/sway/.config/systemd/user/nwg-drawer.service b/sway/.config/systemd/user/nwg-drawer.service
new file mode 100644
index 0000000..7004941
--- /dev/null
+++ b/sway/.config/systemd/user/nwg-drawer.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=NWG Drawer Provider
+BindsTo=sway-session.target
+
+[Service]
+ExecStart=nwg-drawer -r
+KillMode=process
+
+[Install]
+WantedBy=sway-session.target