Use proper scheme with static registry Upstream-commit: 9d4771760af5326a2fff2e0bc091743331753253 Component: engine