Fix them dynamic endpoints, maybe
Merge pull request #1107 from control-center/feature/fix-dynamic-endpoints

Fix them dynamic endpoints