diff --git a/automation/systemd-services/system/aliendalvik.service b/automation/systemd-services/system/aliendalvik.service
index a328dba..c493227 100644
--- a/automation/systemd-services/system/aliendalvik.service
+++ b/automation/systemd-services/system/aliendalvik.service
@@ -6,6 +6,11 @@ After=systemd-user-sessions.service network.target lxc-net.service aliendalvik-c
 
 [Service]
 Type=notify
+NotifyAccess=all
+TimeoutSec=180
+Restart=never
+RestartSec=3
+RestartPreventExitStatus=32
 ExecStart=/usr/bin/aliendalvik
 ExecStop=/usr/bin/lxc-attach --name=aliendalvik --lxcpath=/tmp/appsupport -- /system/bin/reboot -p
 
diff --git a/automation/systemd-services/system/apkd-bridge-user-connman-shim.service b/automation/systemd-services/system/apkd-bridge-user-connman-shim.service
deleted file mode 100644
index 4413af7..0000000
--- a/automation/systemd-services/system/apkd-bridge-user-connman-shim.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Aliendalvik main bridge connman DBus shim
-After=dbus.socket
-Requires=dbus.socket
-
-[Service]
-Type=dbus
-BusName=net.connman
-Restart=always
-ExecStart=/usr/bin/apkd-bridge-user-connman-shim
diff --git a/automation/systemd-services/user/alienkeyboard-maliit-shim.service b/automation/systemd-services/user/alienkeyboard-maliit-shim.service
deleted file mode 100644
index e860f54..0000000
--- a/automation/systemd-services/user/alienkeyboard-maliit-shim.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Aliendalvik keyboard maliit DBus shim
-After=dbus.socket graphical-session.target
-Requires=dbus.socket graphical-session.target
-
-[Service]
-Type=simple
-Restart=always
-RestartSec=5
-ExecStart=/usr/bin/alienkeyboard-maliit-shim/alienkeyboard-maliit-shim