diff --git a/templates/base_public.html b/templates/base_public.html
index 5ff93a4a..2a5e9c32 100644
--- a/templates/base_public.html
+++ b/templates/base_public.html
@@ -24,7 +24,7 @@
       </a>
 
       {% if g.current_user %}
-        <a href="/" class="topbar__link">
+        <a href="{{ url_for('atst.home') }}" class="topbar__link">
           <span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
           {{ Icon('avatar', classes='topbar__link-icon') }}
         </a>
@@ -48,7 +48,7 @@
     <div class='app-footer__info'>
       <h5 class='app-footer__info__title'>Joint Enterprise Defense Infrastructure</h5>
 
-      <a href='/help' class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
+      <a href='{{ url_for('atst.helpdocs') }}' class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
         {{ Icon('help') }}
         <span>JEDI Help</span>
       </a>
diff --git a/templates/footer.html b/templates/footer.html
index 032ec413..f8934fb6 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -4,7 +4,7 @@
   <div class='app-footer__info'>
     <h5 class='app-footer__info__title'>Joint Enterprise Defense Infrastructure</h5>
 
-    <a href='/help' class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
+    <a href='{{ url_for('atst.helpdocs') }}' class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
       {{ Icon('help') }}
       <span>JEDI Help</span>
     </a>
diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html
index 21a381db..b5bd8e78 100644
--- a/templates/navigation/topbar.html
+++ b/templates/navigation/topbar.html
@@ -20,7 +20,7 @@
         </a>
       {% endif %}
 
-      <a href="/" class="topbar__link">
+      <a href="{{ url_for('atst.home') }}" class="topbar__link">
         <span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
         {{ Icon('avatar', classes='topbar__link-icon') }}
       </a>