Merge pull request #6561 from cortexproject/cherry-pick-5921 #11153

Job	Run time
CodeQL	5m 21s
build	3m 43s
lint	3m 59s
test	18m 41s
integration-configs-db	2m 13s
integration (requires_docker)	6m 1s
integration (integration_alertmanager)	4m 6s
integration (integration_backward_compatibility)	8m 29s
integration (integration_memberlist)	7m 25s
integration (integration_querier)	12m 49s
integration (integration_ruler)	4m 23s
integration (integration_query_fuzz)	2m 30s
deploy_website	56s
deploy	3m 28s
	1h 24m 4s

Provide feedback