Merge autostart configurations

These are now the same on both machines. I'm also considering a different
approach than the current