diff --git a/website/src/_includes/markdown-alternate.html b/website/src/_includes/markdown-alternate.html
index cb4da7cb92..f8367dd2ac 100644
--- a/website/src/_includes/markdown-alternate.html
+++ b/website/src/_includes/markdown-alternate.html
@@ -1,8 +1,8 @@
 {% set markdownAlternateUrl = page | markdownAlternate %}
 {% if markdownAlternateUrl %}<link rel="alternate" type="text/markdown" href="{{ markdownAlternateUrl }}"/>{% endif %}
 <link rel="describedby" href="/llms.txt"/>
-<link rel="simplex-channel" href="https://smp18.simplex.im/c#grcfG3ulVI4Sh6ow33qBsmSk7uEy3gRSl2KkJ5ER6tA" title="SimpleX Network News"/>
-<link rel="simplex-channel" href="https://smp10.simplex.im/c#q09nMBmWFGz1m2TvgfZFaEOG5D2a7Ma9mSkl6pHXEsg" title="SimpleX Crowdfunding News"/>
-<link rel="simplex-group" href="https://smp4.simplex.im/g#hr4lvFeBmndWMKTwqiodPz3VBo_6UmdGWocXd1SupsM" title="SimpleX users group"/>
-{% if active_directory %}<link rel="simplex-contact" href="https://smp4.simplex.im/a#lXUjJW5vHYQzoLYgmi8GbxkGP41_kjefFvBrdwg-0Ok" title="SimpleX Directory"/>
-{% endif %}<link rel="simplex-contact" href="https://smp6.simplex.im/a#lrdvu2d8A1GumSmoKb2krQmtKhWXq-tyGpHuM7aMwsw" title="Ask SimpleX Team"/>
+<link rel="simplex" href="https://smp18.simplex.im/c#grcfG3ulVI4Sh6ow33qBsmSk7uEy3gRSl2KkJ5ER6tA" title="SimpleX Network News"/>
+<link rel="simplex" href="https://smp10.simplex.im/c#q09nMBmWFGz1m2TvgfZFaEOG5D2a7Ma9mSkl6pHXEsg" title="SimpleX Crowdfunding News"/>
+<link rel="simplex" href="https://smp4.simplex.im/g#hr4lvFeBmndWMKTwqiodPz3VBo_6UmdGWocXd1SupsM" title="SimpleX users group"/>
+{% if active_directory %}<link rel="simplex" href="https://smp4.simplex.im/a#lXUjJW5vHYQzoLYgmi8GbxkGP41_kjefFvBrdwg-0Ok" title="SimpleX Directory"/>
+{% endif %}<link rel="simplex" href="https://smp6.simplex.im/a#lrdvu2d8A1GumSmoKb2krQmtKhWXq-tyGpHuM7aMwsw" title="Ask SimpleX Team"/>
diff --git a/website/src/crowdfunding-news.html b/website/src/crowdfunding-news.html
index c703e03892..dffcc9c5b3 100644
--- a/website/src/crowdfunding-news.html
+++ b/website/src/crowdfunding-news.html
@@ -11,4 +11,4 @@ channel:
     - relay3.simplex.chat
 ---
 
-<p>The news about SimpleX Chat equity crowdfunding on Wefunder, published as a SimpleX channel. Join it in the SimpleX Chat app: <a href="{{ channel.link }}" rel="simplex-channel">SimpleX Crowdfunding News</a>. The crowdfunding memo: <a href="/wefunder.md">simplex.chat/wefunder.md</a>.</p>
+<p>The news about SimpleX Chat equity crowdfunding on Wefunder, published as a SimpleX channel. Join it in the SimpleX Chat app: <a href="{{ channel.link }}" rel="simplex">SimpleX Crowdfunding News</a>. The crowdfunding memo: <a href="/wefunder.md">simplex.chat/wefunder.md</a>.</p>
diff --git a/website/src/directory.html b/website/src/directory.html
index 7725930769..8ab3166dcd 100644
--- a/website/src/directory.html
+++ b/website/src/directory.html
@@ -318,7 +318,7 @@ active_directory: true
     <h1 class="text-[38px] md:text-[45px] text-center font-bold text-active-blue mb-8">SimpleX Directory</h1>
     <p>Welcome to the selected users' communities that you can join via <a href="/downloads">SimpleX Chat
         app</a>.</p>
-    <p>SimpleX Directory is also available as a <a href="https://smp4.simplex.im/a#lXUjJW5vHYQzoLYgmi8GbxkGP41_kjefFvBrdwg-0Ok" target="_blank" rel="noopener simplex-contact">SimpleX chat bot</a>.</p>
+    <p>SimpleX Directory is also available as a <a href="https://smp4.simplex.im/a#lXUjJW5vHYQzoLYgmi8GbxkGP41_kjefFvBrdwg-0Ok" target="_blank" rel="noopener simplex">SimpleX chat bot</a>.</p>
     <p>Read about <a href="/docs/directory.html">how to add</a> your community.</p>
     <template data-markdown><p>All listed groups and channels in JSON, with names, descriptions, member counts, join links and activity times: <a href="https://directory.simplex.chat/data/listing.json">directory.simplex.chat/data/listing.json</a>.</p></template>
     <div class="search-container">
diff --git a/website/src/index.html b/website/src/index.html
index bdb00f785d..2925915a64 100644
--- a/website/src/index.html
+++ b/website/src/index.html
@@ -273,7 +273,7 @@ active_home: true
                     <a href="/directory" class="group-image" target="_blank" rel="noopener"><img src="/img/group.svg"></a>
                     <a href="/directory" class="group-image" target="_blank" rel="noopener"><img src="/img/group.svg"></a>
                     <a href="/directory" class="group-image" target="_blank" rel="noopener"><img src="/img/group.svg"></a>
-                    <a href="https://smp4.simplex.im/g#hr4lvFeBmndWMKTwqiodPz3VBo_6UmdGWocXd1SupsM" class="simplex-image" title="{{ 'index-directory-users-group-title' | i18n({}, lang) }}" target="_blank" rel="noopener simplex-group">
+                    <a href="https://smp4.simplex.im/g#hr4lvFeBmndWMKTwqiodPz3VBo_6UmdGWocXd1SupsM" class="simplex-image" title="{{ 'index-directory-users-group-title' | i18n({}, lang) }}" target="_blank" rel="noopener simplex">
                         <img class="block dark:hidden" src="/img/new/logo-symbol-light.svg">
                         <img class="hidden dark:block" src="/img/new/logo-symbol-dark.svg">
                     </a>
diff --git a/website/src/js/directory.jsc b/website/src/js/directory.jsc
index 61b19c4ab5..f12f1108d9 100644
--- a/website/src/js/directory.jsc
+++ b/website/src/js/directory.jsc
@@ -339,7 +339,7 @@ function displayEntries(entries) {
         imgLinkElement.href = groupLinkUri;
       }
       imgLinkElement.target = "_blank";
-      imgLinkElement.rel = entryType?.groupType === 'channel' ? "noopener simplex-channel" : "noopener simplex-group";
+      imgLinkElement.rel = groupLink.connShortLink ? "noopener simplex" : "noopener";
       imgLinkElement.title = `Join ${displayName}`;
 
       const imgElement = document.createElement('img');
diff --git a/website/src/news.html b/website/src/news.html
index ef53b04c8d..3c5bd5fdfb 100644
--- a/website/src/news.html
+++ b/website/src/news.html
@@ -12,4 +12,4 @@ channel:
     - relay3.simplex.chat
 ---
 
-<p>The news about SimpleX Network technology, governance and anything related to its development, published as a SimpleX channel. Join it in the SimpleX Chat app: <a href="{{ channel.link }}" rel="simplex-channel">SimpleX Network News</a>.</p>
+<p>The news about SimpleX Network technology, governance and anything related to its development, published as a SimpleX channel. Join it in the SimpleX Chat app: <a href="{{ channel.link }}" rel="simplex">SimpleX Network News</a>.</p>