diff --git a/_config.yml b/_config.yml
index a5cc8ad..d171956 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,7 +43,7 @@ social:
   links:
     - https://twitter.com/ToSettoSetto
     - https://instagram.com/ToSettoSetto
-    - https://sonomu.club/@setto
+    - https://s.basspistol.org/@setto
     - https://www.facebook.com/徒-setto-セット-100627981795265
   usernames:
     twitter: ToSettoSetto
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 6808b17..d5dec8a 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -11,7 +11,7 @@
   name: Blog
   external_site: true
 - icon: 📢
-  url: 'https://sonomu.club/@setto'
+  url: 'https://s.basspistol.org/@setto'
   name: Fedi
   external_site: true
 - icon: ㊙️
diff --git a/_data/social.yml b/_data/social.yml
index cb4596d..50960a7 100644
--- a/_data/social.yml
+++ b/_data/social.yml
@@ -1,6 +1,6 @@
 ---
 - name: Mastodon
-  url: 'https://sonomu.club/@setto'
+  url: 'https://s.basspistol.org/@setto'
   icon: fa-mastodon
   share_link:
   we_have_account: true
@@ -19,7 +19,7 @@
     page.title | xml_escape }}
   we_have_account: true
 - name: Peertube
-  url: 'https://v.basspistol.org/video-channels/tosettosetto/'
+  url: 'https://v.basspistol.org/a/setto/'
   icon: fa-youtube
   share_link:
   we_have_account: true
@@ -28,4 +28,4 @@
   icon: fa-connectdevelop
   share_link:
   we_have_account: true
----
\ No newline at end of file
+---
diff --git a/_includes/footer.html b/_includes/footer.html
index 23c8fb2..b3f158c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -21,7 +21,7 @@
     <small>
       <div style="text-align: center;">
         {% for nw in site.data.social %}
-        <a target="_blank" alt="{{ site.title }} on {{ nw.name }}" title="{{ site.title }} on {{ nw.name }}" rel="{% if nw.url contains 'sonomu.club' %}me {% endif %}noopener"
+        <a target="_blank" alt="{{ site.title }} on {{ nw.name }}" title="{{ site.title }} on {{ nw.name }}" rel="{% if nw.url contains 's.basspistol.org' %}me {% endif %}noopener"
           href="{{ nw.url }}" class="icon small fab {{ nw.icon }}"><span class="label">{{ nw.name }}</span></a>
         {% endfor %}
         <a target="_blank" alt="email" title="email" href="mailto:{{ site.social.mail }}" class="icon small fas fa-envelope-open-text" rel="me"><span