Updated infra procedures