Revert to forced handlers
Update metrics config