Factorize step addition and fix connection handling
Switch to non privileged app.