diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -52,7 +52,7 @@
               </ul>
             </li>
             <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
-            <li><a href="https://wiki.enn.lu">Wiki</a></li>
+            <li><a href="{{ get_wiki_address() }}">Wiki</a></li>
             <li><a href="{{ url_for('root.disclaimer') }}">About Ennstatus</a></li>
           </ul>
         </li>
diff --git a/ennstatus/templates/macros.html b/ennstatus/templates/macros.html
--- a/ennstatus/templates/macros.html
+++ b/ennstatus/templates/macros.html
@@ -16,3 +16,13 @@
     {{ message }}
   </div>
 {% endmacro %}
+
+{% macro get_wiki_address() %}
+  {% if '.onion' in request.url_root %}
+    {{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}
+  {% elif '.bit' in request.url_root %}
+    {{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }}
+  {% else %}
+    //wiki.enn.lu
+  {% endif %}
+{% endmacro %}
diff --git a/ennstatus/templates/root/mirrors.html b/ennstatus/templates/root/mirrors.html
--- a/ennstatus/templates/root/mirrors.html
+++ b/ennstatus/templates/root/mirrors.html
@@ -2,6 +2,16 @@
 
 {% set title = "Partners" %}
 
+{% macro get_globe_address() %}
+  {% if '.onion' in request.url_root %}
+    {{ config['ENNSTATUS_GLOBE_ONION_ADDRESS'] }}
+  {% elif '.bit' in request.url_root %}
+    {{ config['ENNSTATUS_GLOBE_BIT_ADDRESS'] }}
+  {% else %}
+    //globe.enn.lu
+  {% endif %}
+{% endmacro %}
+
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Services.png') }}" class="img-rounded" alt="Partners" width="160"></img>
@@ -17,7 +27,7 @@
       <dt><a href="http://tails.c3l.lu/" target="_blank">tails.enn.lu</a></dt>
       <dd>A Tails Download mirror. Tails is a live operating system, that you can start on almost any computer from a DVD, USB stick, or SD card. It aims at preserving your privacy and anonymity. <a href="https://tails.boum.org/" target="blank">Learn more about Tails</a></dd>
       <br>
-      <dt><a href="https://globe.enn.lu/" target="_blank">globe.enn.lu</a></dt>
+      <dt><a href="{{ get_globe_address() }}" target="_blank">globe.enn.lu</a></dt>
       <dd>Globe is a Tor relay and bridge explorer.</dd>
     </dl>
   </div>