diff --git a/conf/server-base.conf b/conf/server-base.conf
index c502c862a..df1fed771 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -116,6 +116,8 @@ location /static/ {
error_page 404 /404;
}
+error_page 502 /static/502.html;
+
location ~ ^/b1/controller(/?)(.*) {
proxy_pass http://build_manager_controller_server/$2;
}
diff --git a/static/502.html b/static/502.html
new file mode 100644
index 000000000..ab9680ed4
--- /dev/null
+++ b/static/502.html
@@ -0,0 +1,27 @@
+
+
+ Quay Loading
+
+
+
+
+
+
+
+
+
+