diff --git a/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html b/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html
index 080e1a42f5..119c8f9967 100644
--- a/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html
+++ b/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html
@@ -23,7 +23,7 @@
       <div class="container">
         <div class="row">
           <div class="col-sm-3">
-            <a href="{{ url_for('index') }}">
+            <a href="{{ url_for('ui_ns.index') }}">
               <img height=40px src="{{ url_for('static', filename='upstreamfirst_plain.png') }}"
                 alt="pagure Logo" id="pagureLogo"/>
             </a>
@@ -37,11 +37,11 @@
           {% if not nologin %}
             {% if g.fas_user %}
               <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('browse_projects') }}">Browse</a>
+                <a class="nav-link" href="{{ url_for('ui_ns.browse_projects') }}">Browse</a>
               </li>
               {% if config.get('ENABLE_NEW_PROJECTS', True) %}
                 <li class="nav-item p-l-1">
-                  <a class="nav-link" href="{{ url_for('new_project') }}">
+                  <a class="nav-link" href="{{ url_for('ui_ns.new_project') }}">
                       <span class="oi" data-glyph="plus" title="Create New"
                           aria-hidden="true">
                       </span>
@@ -59,19 +59,19 @@
                   </div>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="{{
-                    url_for('view_user', username=g.fas_user.username)
+                    url_for('ui_ns.view_user', username=g.fas_user.username)
                     }}">My Public Profile</a>
                   <a class="dropdown-item" href="{{
-                    url_for('user_settings')
+                    url_for('ui_ns.user_settings')
                     }}">My Settings</a>
                   <div class="dropdown-divider"></div>
                   {% if config.get('ENABLE_TICKETS', True) %}
                     <a class="dropdown-item" href="{{
-                      url_for('view_user_issues', username=g.fas_user.username)
+                      url_for('ui_ns.view_user_issues', username=g.fas_user.username)
                       }}">My Issues</a>
                   {% endif %}
                   <a class="dropdown-item" href="{{
-                    url_for('view_user_requests', username=g.fas_user.username)
+                    url_for('ui_ns.view_user_requests', username=g.fas_user.username)
                     }}">My Pull Requests</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="{{ url_for('auth_logout')
@@ -162,7 +162,7 @@
           <a href="https://pagure.io/pagure">pagure</a> &mdash;
           {{version}} &mdash; <a href="https://docs.pagure.org/pagure/usage.html">Documentation</a>
             </p>
-            <p><a href="{{ url_for('ssh_hostkey') }}">SSH Hostkey/Fingerprint</a></p>
+            <p><a href="{{ url_for('ui_ns.ssh_hostkey') }}">SSH Hostkey/Fingerprint</a></p>
         </div>
     </div>