diff --git a/buildman/buildcomponent.py b/buildman/buildcomponent.py
index 83ff998bd..dbad6540d 100644
--- a/buildman/buildcomponent.py
+++ b/buildman/buildcomponent.py
@@ -130,7 +130,7 @@ class BuildComponent(BaseComponent):
       'build_package': buildpack_url,
       'sub_directory': build_config.get('build_subdir', ''),
       'repository': repository_name,
-      'registry': '10.0.2.2:5000' or self.server_hostname,
+      'registry': self.server_hostname,
       'pull_token': build_job.repo_build().access_token.code,
       'push_token': build_job.repo_build().access_token.code,
       'tag_names': build_config.get('docker_tags', ['latest']),
diff --git a/buildman/buildstatus.py b/buildman/buildstatus.py
index b888754ad..d09876e10 100644
--- a/buildman/buildstatus.py
+++ b/buildman/buildstatus.py
@@ -35,7 +35,7 @@ class StatusHandler(object):
 
   def set_phase(self, phase, extra_data=None):
     if phase == self._current_phase:
-      return 
+      return
       
     self._current_phase = phase
     self._append_log_message(phase, self._build_logs.PHASE, extra_data)