Fixes for v4 waits and restores (#1868) #2151

Job	Run time
typecheck / typecheck	5m 2s
units / 🧪 Unit Tests	11m 43s
publish-worker / build (coordinator)	1m 30s
publish-webapp / publish	3m 10s
publish-worker / build (docker-provider)	59s
publish-worker / build (kubernetes-provider)	39s
	23m 3s

Provide feedback