diff --git a/source/_data/common.json b/source/_data/common.json
index ff82c1c..68672f7 100644
--- a/source/_data/common.json
+++ b/source/_data/common.json
@@ -22,7 +22,7 @@
       },
       {
         "title": "Hubzilla",
-        "url" : " https://project.hubzilla.org",
+        "url" : " https://hubzilla.org",
         "smallImg": "/img/hubzilla.png",
         "descr": "Feature-rich social platform. Create channels with a decentralized nomadic identity"
       },
@@ -71,7 +71,7 @@
       },
       {
         "name": "Zot",
-        "url": "https://project.hubzilla.org/help/developer/zot_protocol"
+        "url": "https://zotlabs.org/help/developer/zot_protocol"
       },
       {
         "name": "ActivityPub",
diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json
index c30b9a8..4ebe01e 100644
--- a/source/_data/hubzilla.json
+++ b/source/_data/hubzilla.json
@@ -7,18 +7,18 @@
       "type": "macroblogging",
       "logoClr": "43488a",
       "created": "2015",
-      "official": "https://project.hubzilla.org",
+      "official": "https://hubzilla.org",
       "license": "MIT",
       "repo": "https://framagit.org/hubzilla/core",
       "language": "PHP",
       "protocols":
         [
-          {"title": "Zot", "url": "https://project.hubzilla.org/help/developer/zot_protocol"},
+          {"title": "Zot", "url": "https://zotlabs.org/help/developer/zot_protocol"},
           {"title": "OStatus", "url": "https://github.com/OStatus"},
           {"title": "diaspora", "url": "https://github.com/diaspora/diaspora_federation"},
           {"title": "ActivityPub", "url": "https://activitypub.rocks"}
         ],
-      "wiki": "https://project.hubzilla.org/wiki/hubzilla/Hubzilla%2BProject/Home",
+      "wiki": "",
       "servers":
         [
           {"num": "1", "url": "https://the-federation.info/hubzilla"},
@@ -28,12 +28,12 @@
       "mobile": "",
       "tutorials":
         [
-          {"id": "0", "url": "https://project.hubzilla.org/help/member/member_guide"},
-          {"id": "1", "url": "https://project.hubzilla.org/help/admin/administrator_guide"},
-          {"id": "2", "url": "https://project.hubzilla.org/help/tutorials/personal_channel"}
+          {"id": "0", "url": "https://zotlabs.org/help/member/member_guide"},
+          {"id": "1", "url": "https://zotlabs.org/help/developer/developer_guide"},
+          {"id": "2", "url": "https://zotlabs.org/help/tutorials/personal_channel"}
 
         ],
-      "devTutorial": "https://github.com/redmatrix/hubzilla/wiki/Deploying-Hubzilla#install-and-set-up-the-basics",
+      "devTutorial": "https://zotlabs.org/help/admin/administrator_guide",
       "cheatsheets":
         [
           {"id": "0", "url": "/img/hubzilla-permissions.png"}
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index c5b2f6d..87bb4a1 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -88,6 +88,7 @@ uMatch: Find users similar to you by their vocabulary
 wizard: SERVER WIZARD
 userGuide: User guide
 adminGuide: Administrator guide
+devGuide: Developer guide
 
 # diaspora page
 proxy: proxy
diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs
index 130cd32..be46c63 100644
--- a/themes/starter/layout/hubzilla.ejs
+++ b/themes/starter/layout/hubzilla.ejs
@@ -7,7 +7,7 @@ layout: layout
   const data = site.data.hubzilla.data;
   const tutorials = data.tutorials;
   const cheatsheets = data.cheatsheets;
-  const tuts = [__('userGuide'), __('adminGuide'), __('channel')];
+  const tuts = [__('userGuide'), __('devGuide'), __('channel')];
   const sheets = [__('permissions')];
 %>