etib-branch-feature-task-6-updates Gatekeeper