[Service]
Type=simple
-Environment=AFM_ID=homescreen
-Environment=AFM_APP_INSTALL_DIR=/usr/lib/wam_apps/html5-homescreen/
-ExecStartPre=sleep 1
-ExecStart=/usr/bin/WebAppMgr
+User=agl-driver
+EnvironmentFile=-/etc/default/WebAppMgr.env
+Environment=XDG_RUNTIME_DIR=/run/user/1001/
+ExecStartPre=sleep 5
+ExecStart=/usr/bin/WebAppMgrCli --appid=homescreen --app-install-dir=/usr/lib/wam_apps/html5-homescreen/
Restart=on-failure
[Install]
-WantedBy=agl-session.target
+WantedBy=graphical.target