Merge "Make new UI default."
diff --git a/src/dockerfiles/compose/docker-compose.yaml b/src/dockerfiles/compose/docker-compose.yaml
index 269801d..6851ee7 100644
--- a/src/dockerfiles/compose/docker-compose.yaml
+++ b/src/dockerfiles/compose/docker-compose.yaml
@@ -82,7 +82,7 @@
     restart: on-failure
     user: moblab
     ports:
-      - 80:8888
+      - 6010:8888
 
     volumes:
       - logs:/var/log/moblab
@@ -236,7 +236,7 @@
       - GOOGLE_APPLICATION_CREDENTIALS=/home/moblab/.service_account.json
 
     ports:
-      - 6010:6010
+      - 80:6010
   ##############################################################################
   moblab-rpcserver:
     image: ${REGISTRY_URI:-gcr.io/chromeos-partner-moblab}/moblab-rpcserver:${MOBLAB_RPCSERVER:-release}
diff --git a/src/moblab-ui/src/app/app-sidebar/app-sidebar.component.html b/src/moblab-ui/src/app/app-sidebar/app-sidebar.component.html
index 819c496..72eb0d6 100644
--- a/src/moblab-ui/src/app/app-sidebar/app-sidebar.component.html
+++ b/src/moblab-ui/src/app/app-sidebar/app-sidebar.component.html
@@ -25,7 +25,7 @@
 
       <span id="links-box">
         <div class="link-box-item">
-          <a style="color: white;" href="http://www.localhost/afe" target="_blank">Old UI</a>
+          <a style="color: white;" href="http://www.localhost:6010/afe" target="_blank">Old UI</a>
         </div>
         |
         <div class="link-box-item">
diff --git a/third_party/autotest/frontend/client/src/autotest/afe/AfeClient.java b/third_party/autotest/frontend/client/src/autotest/afe/AfeClient.java
index 43c12a1..ee78fc0 100644
--- a/third_party/autotest/frontend/client/src/autotest/afe/AfeClient.java
+++ b/third_party/autotest/frontend/client/src/autotest/afe/AfeClient.java
@@ -73,7 +73,7 @@
         Document.get().getElementById("mobmonitor_link").setAttribute("href",
                 "http://" + Location.getHostName() + ":9991");
         Document.get().getElementById("newui").setAttribute("href",
-                "http://" + Location.getHostName() + ":6010");
+                "http://" + Location.getHostName() + ":80");
 
         jobList = new JobListView(new JobSelectListener() {
             public void onJobSelected(int jobId) {
diff --git a/third_party/autotest/frontend/client/src/autotest/moblab/MoblabSetupClient.java b/third_party/autotest/frontend/client/src/autotest/moblab/MoblabSetupClient.java
index a595c52..75f185e 100644
--- a/third_party/autotest/frontend/client/src/autotest/moblab/MoblabSetupClient.java
+++ b/third_party/autotest/frontend/client/src/autotest/moblab/MoblabSetupClient.java
@@ -46,6 +46,6 @@
     Document.get().getElementById("mobmonitor_link").setAttribute("href",
     "http://" + Location.getHostName() + ":9991");
     Document.get().getElementById("newui").setAttribute("href",
-    "http://" + Location.getHostName() + ":6010");
+    "http://" + Location.getHostName() + ":80");
   }
 }