diff --git a/data/templates/splash.html b/data/templates/splash.html
index f0e9aa5..a840e42 100644
--- a/data/templates/splash.html
+++ b/data/templates/splash.html
@@ -1,32 +1,32 @@
 {% extends "base.html" %}
 
 {% block content %}
 <h1>{{ 'tool-labs'|message }}</h1>
 <p><strong>Toolforge</strong> is a hosting environment for developers working on services that provide value to the Wikimedia movement. These services allow developers to easily do ad hoc analytics, administer bots, run webservices, and generally create tools to help editors and other volunteers in their work. The environment also includes access to a variety of <a href="https://wikitech.wikimedia.org/wiki/Portal:Data_Services">data services</a>. The infrastructure is supported by a dedicated <a href="https://tools.wmflabs.org/openstack-browser/project/tools">group of Wikimedia Foundation staff and volunteers.</a></p>
 
 <p>Read more about <a href="https://wikitech.wikimedia.org/wiki/Portal:Toolforge">Toolforge on wikitech (the Wikimedia technical infrastructure wiki)</a>.
 
 <h2>Find a tool</h2>
 <ul>
 <li><a href="{{ urlFor('tools') }}">List of all tools hosted on Toolforge</a></li>
 <li><a href="https://tools.wmflabs.org/hay/directory/">Hay's Tools Directory</a></li>
 </ul>
 
 <h2>Develop your own tool</h2>
 <div class="seealso">
 See also: <a href="{{ urlFor('wiki', {'name': 'Getting_started'}) }}">Getting started</a>
 </div>
 <ol>
-<li><a href="https://toolsadmin.wikimedia.org/register/">Create a new LDAP account</a> (you must have an LDAP account to access the Toolforge project)</li>
-<li><a href="https://toolsadmin.wikimedia.org/profile/settings/ssh-keys">Add a public SSH key</a> (you will need this to access Labs servers using SSH)</li>
+<li><a href="https://toolsadmin.wikimedia.org/register/">Create an LDAP account</a> (you must have an LDAP account to access the Toolforge project)</li>
+<li><a href="https://toolsadmin.wikimedia.org/profile/settings/ssh-keys">Add a public SSH key</a> (you will need this to access Toolforge servers using SSH)</li>
 <li><a href="https://toolsadmin.wikimedia.org/tools/membership/apply">Request access to the Toolforge project</a> (Join us!)</li>
-<li><a href="https://wikitech.wikimedia.org/w/index.php?title=Special:NovaServiceGroup&action=addservicegroup&projectname=tools">Create a new Tool</a></li>
+<li><a href="https://toolsadmin.wikimedia.org/tools/create/">Create a new Tool</a></li>
 </ol>
 
 <h2>Other links</h2>
 <ul>
 <li><a href="https://phabricator.wikimedia.org/diffusion/1922/">Source code repository of this website</a></li>
 </ul>
 
 <!-- Hey icinga: Magnus is one of our more prolific Tool developers and generally a very nice fellow. -->
 {% endblock content %}
diff --git a/data/templates/tool.html b/data/templates/tool.html
index 98158e7..9b3c30b 100644
--- a/data/templates/tool.html
+++ b/data/templates/tool.html
@@ -1,42 +1,42 @@
 {% extends "base.html" %}
 {% import "inc/utils.html" as utils %}
 
 {% block title %}{{ 'tool-title'|message(tool.name) }} - {{ parent() }}{% endblock %}
 
 {% block content %}
 <h1>{{ 'tool-labs'|message }}</h1>
 <p>{{ 'tool-labs-desc'|message }}</p>
 
 {% if tool.name %}
 <h2>Tool account: {{ tool.name }}</h2>
 <table class="tool-info" cols="2" width="95%">
   <tr>
     <th>Maintainers</th>
     <td>{{ utils.printMaintainers( maintainers ) }}
-      <br><span class="mw-editsection">[<a href="https://wikitech.wikimedia.org/w/index.php?title=Special:NovaServiceGroup&action=managemembers&projectname=tools&servicegroupname=tools.{{ tool.name|url_encode }}">manage</a> maintainers]</span>
+      <br><span class="mw-editsection">[<a href="https://toolsadmin.wikimedia.org/tools/id/{{ tool.name|url_encode }}/maintainers/">manage</a> maintainers]</span>
     </td>
   </tr>
   <tr>
     <th>Tool{% if tool.toolinfo|length > 1 %}s{% endif %}</th>
     <td>
       {% for info in tool.toolinfo %}
       <div class="subtool {% if loop.first %}first{% endif %}">
         <div class="subtool-name">
           {% if info.url %}
           <a href="{{ info.url }}">{{ info.title }}</a>
           {% elseif tool.toolinfo|length == 1 and active %}
           <a class="tool-web" href="/{{ tool.name }}/">{{ tool.name }}</a>
           {% else %}
           {{ info.title }}
           {% endif %}
         </div>
         <div class="subtool-desc">{{ utils.describe_tool(info) }}</div>
       </div>
       {% endfor %}
     </td>
   </tr>
 </table>
 {% else %}
 <p>No such tool?  Trying to guess, are you?</p>
 {% endif %}
 {% endblock content %}
diff --git a/data/templates/tools.html b/data/templates/tools.html
index 0d68ebd..6bbb73d 100644
--- a/data/templates/tools.html
+++ b/data/templates/tools.html
@@ -1,69 +1,69 @@
 {% extends "base.html" %}
 {% import "inc/utils.html" as utils %}
 
 {% block title %}{{ 'tools-title'|message }} - {{ parent() }}{% endblock %}
 
 {% block content %}
 <h1>{{ 'tool-labs'|message }}</h1>
 <p>{{ 'tool-labs-desc'|message }}</p>
 <h2>{{ 'tools-header'|message }}</h2>
 
 <table id="thebigtable" class="tablesorter">
   <thead>
     <tr>
       <th>Tool</th>
       <th>Maintainers</th>
       <th>Notes</th>
     </tr>
   </thead>
   <tbody>
     {% for tool in tools %}
     <tr class="tool" id="toollist-{{ tool.name }}">
       <td class="tool-name">
         {% if tool.toolinfo|length == 1 %}
         {% set info = tool.toolinfo[0] %}
         {% if info.url %}
         <a class="tool-web" href="{{ info.url }}">{{ tool.name }}</a>
         {% elseif active[tool.name] %}
         <a class="tool-web" href="/{{ tool.name }}/">{{ tool.name }}</a>
         {% else %}
         {{ tool.name }}
         {% endif %}
         {% else %}
         {{ tool.name }}
         {% endif %}
-        <span class="mw-editsection">[<a href="https://wikitech.wikimedia.org/w/index.php?title=Special:NovaServiceGroup&action=managemembers&projectname=tools&servicegroupname=tools.{{ tool.name|url_encode }}">manage</a> maintainers]</span>
+        <span class="mw-editsection">[<a href="https://toolsadmin.wikimedia.org/tools/id/{{ tool.name|url_encode }}/maintainers/">manage</a> maintainers]</span>
       </td>
       <td class="tool-maintainers">
         {% for maintainer in tool.maintainers %}
         {% if users[maintainer] %}
         {% set wiki_user = users[maintainer].wikitech %}
         <a href="https://wikitech.wikimedia.org/wiki/User:{{ utils.as_title(wiki_user)|url_encode }}">{{ utils.ucfirst(wiki_user) }}</a>
         {% endif %}
         {% endfor %}
       </td>
       <td class="tool-desc">
         {% if tool.toolinfo|length == 1 %}
         {{- utils.describe_tool(tool.toolinfo[0]) -}}
         {% else %}
         {% for info in tool.toolinfo %}
         <div class="subtool {% if loop.first %}first{% endif %}">
           <div class="subtool-name">
             {% if info.url %}
             <a href="{{ info.url }}">{{ info.title }}</a>
             {% else %}
             {{ info.title }}
             {% endif %}
           </div>
           <div class="subtool-desc">{{ utils.describe_tool(info) }}</div>
         </div>
         {% endfor %}
         {% endif %}
       </td>
     </tr>
     {% endfor %}
   </tbody>
 </table>
 {% endblock content %}
 
 {% block javascript %}{% include '_tablesort-js.html' %}{% endblock javascript %}