Adopted the benchmark to our cloud environment