diff --git a/test_suites/control.au b/test_suites/control.au
index b989ae2..9084f16 100644
--- a/test_suites/control.au
+++ b/test_suites/control.au
@@ -35,7 +35,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['au_suite'])
 
 # Values specified in this bug template will override default values when
diff --git a/test_suites/control.paygen_au_beta b/test_suites/control.paygen_au_beta
index d2d6f75..4a39f88 100644
--- a/test_suites/control.paygen_au_beta
+++ b/test_suites/control.paygen_au_beta
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_beta_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently
diff --git a/test_suites/control.paygen_au_canary b/test_suites/control.paygen_au_canary
index 81187fb..b95bf7a 100644
--- a/test_suites/control.paygen_au_canary
+++ b/test_suites/control.paygen_au_canary
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_canary_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently
diff --git a/test_suites/control.paygen_au_dev b/test_suites/control.paygen_au_dev
index 2f966dd..fd2241d 100644
--- a/test_suites/control.paygen_au_dev
+++ b/test_suites/control.paygen_au_dev
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_dev_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently
diff --git a/test_suites/control.paygen_au_stable b/test_suites/control.paygen_au_stable
index b2a33a9..add7d83 100644
--- a/test_suites/control.paygen_au_stable
+++ b/test_suites/control.paygen_au_stable
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_stable_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently