diff --git a/README.md b/README.md
index 336dfab78d..931b73127d 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ Information on how to setup and build the codebase can be found [here](./CONTRIB
 
 If you want to add or improve support for a language, read the documentation on [language features](./docs/development/language-features.md).
 
-Feel free to join us on [TheMoeWay Discord 🐇](https://discord.gg/UGNPMDE7zC) at [#yomitan-development](https://discord.com/channels/617136488840429598/1081538711742844980).
+Feel free to join us on the [Yomitan Discord](https://discord.gg/YkQrXW6TXF).
 
 ## Third-Party Libraries
 
diff --git a/docs/development/language-features.md b/docs/development/language-features.md
index dd794044a6..e9ded95aab 100644
--- a/docs/development/language-features.md
+++ b/docs/development/language-features.md
@@ -414,4 +414,4 @@ In certain languages, dictionary entries may contain readings as a key to read w
 
 ## Stuck?
 
-If you have any questions, please feel free to open a Discussion on Github, or find us on [TheMoeWay Discord](https://discord.gg/UGNPMDE7zC) at [#yomitan-development](https://discord.com/channels/617136488840429598/1081538711742844980).
+If you have any questions, please feel free to open a Discussion on Github, or find us on the [Yomitan Discord](https://discord.gg/YkQrXW6TXF).
diff --git a/package-lock.json b/package-lock.json
index c40c6c0ae4..2aa0a412bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
                 "hangul-js": "^0.2.6",
                 "parse5": "^7.1.2",
                 "wanakana": "^5.3.1",
-                "yomitan-handlebars": "git+https://github.com/themoeway/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25"
+                "yomitan-handlebars": "git+https://github.com/yomidevs/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25"
             },
             "devDependencies": {
                 "@codspeed/vitest-plugin": "^3.1.0",
@@ -10165,7 +10165,7 @@
         "node_modules/yomitan-handlebars": {
             "name": "@kbn/handlebars",
             "version": "1.0.0",
-            "resolved": "git+ssh://git@github.com/themoeway/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25",
+            "resolved": "git+ssh://git@github.com/yomidevs/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25",
             "integrity": "sha512-qx5N8KNppptH+41JkUWAZwWSXTpJG6mHzSa7Q7Wk3AU4IBOQqBlPbDx26HN97mnQM2CGfeiZE4mW2yQ7M5Ja3Q==",
             "license": "MIT"
         }
@@ -17206,9 +17206,9 @@
             "dev": true
         },
         "yomitan-handlebars": {
-            "version": "git+ssh://git@github.com/themoeway/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25",
+            "version": "git+ssh://git@github.com/yomidevs/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25",
             "integrity": "sha512-qx5N8KNppptH+41JkUWAZwWSXTpJG6mHzSa7Q7Wk3AU4IBOQqBlPbDx26HN97mnQM2CGfeiZE4mW2yQ7M5Ja3Q==",
-            "from": "yomitan-handlebars@git+https://github.com/themoeway/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25"
+            "from": "yomitan-handlebars@git+https://github.com/yomidevs/yomitan-handlebars.git#12aff5e3550954d7d3a98a5917ff7d579f3cce25"
         }
     }
 }