diff --git a/buildserver/buildserver.py b/buildserver/buildserver.py
index 207e4d208..c661c079f 100644
--- a/buildserver/buildserver.py
+++ b/buildserver/buildserver.py
@@ -136,7 +136,7 @@ MIME_PROCESSORS = {
   'application/octet-stream': prepare_dockerfile,
 }
 
-
+# If this format it should also be changed in the api method get_repo_builds
 build = {
   'total_commands': None,
   'current_command': None,
diff --git a/endpoints/api.py b/endpoints/api.py
index 95912b570..eb55a38ae 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -874,15 +874,15 @@ def get_repo_builds(namespace, repository):
         return node_status
 
       # If there was no status url, do the best we can
+      # The format of this block should mirror that of the buildserver.
       return {
         'id': build_obj.id,
         'total_commands': None,
-        'total_images': None,
         'current_command': None,
-        'current_image': None,
-        'image_completion_percent': None,
+        'push_completion': 0.0,
         'status': build_obj.phase,
         'message': None,
+        'image_completion': {},
       }
 
     builds = model.list_repository_builds(namespace, repository)
diff --git a/static/js/app.js b/static/js/app.js
index 3deecfd7f..9c33fc12d 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2030,8 +2030,7 @@ quayApp.directive('buildStatus', function () {
                 break;
                 
               case 'pushing':
-                var imagePercentDecimal = (buildInfo.image_completion_percent / 100);
-                return ((buildInfo.current_image + imagePercentDecimal) / buildInfo.total_images) * 100;
+                return buildInfo.push_completion * 100;
                 break;
 
               case 'complete':