SUP-2505 Set stricter time slots

Stefan van Essenrequested to merge
SUP-2505-set-time-slots into main

Closes SUP-2505

Merge request reports