Hello, In order to avoid hardcoding the Service endpoint scheme to: `return f"http://{hostname}:{EDGE_PORT}"` Why not adding: ` LOCALSTACK_SCHEME = urlparse(AWS_ENDPOINT_URL).scheme or "http" ` and then: `return f"{LOCALSTACK_SCHEME}://{hostname}:{EDGE_PORT}"`