diff --git a/debian/lxc-android.service b/debian/lxc-android.service
index 4362708..6023d0a 100644
--- a/debian/lxc-android.service
+++ b/debian/lxc-android.service
@@ -14,7 +14,7 @@ NotifyAccess=exec
 ExecStartPre=/usr/bin/lxc-start -n android -d
 ExecStart=/usr/lib/lxc-android/lxc-android-notify
 KillMode=mixed
-TimeoutStopSec=120s
+TimeoutStopSec=30s
 ExecStop=/usr/lib/lxc-android/lxc-android-stop
 Delegate=yes
 
diff --git a/usr/lib/lxc-android/lxc-android-stop b/usr/lib/lxc-android/lxc-android-stop
index 3972834..d5b9035 100755
--- a/usr/lib/lxc-android/lxc-android-stop
+++ b/usr/lib/lxc-android/lxc-android-stop
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 /usr/bin/setprop sys.powerctl shutdown
-lxc-wait -n android -s "STOPPED" -t 30
+lxc-wait -n android -s "STOPPED" -t 20
 
 # Teardown mapped super partition
 if [ -e "/dev/disk/by-partlabel/super" ]; then