Follow-up on #3435, focusing on bug fixes and improved secrets management.
Follow-up on #3435, focusing on bug fixes and improved secrets management.