diff --git a/PKGBUILD b/PKGBUILD
index 34bfbc77..a2348586 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgbase=kvmd
 pkgver=1.4
 pkgrel=1
 pkgdesc="The main Pi-KVM daemon"
-url="https://github.com/pi-kvm/kvmd"
+url="https://github.com/pikvm/kvmd"
 license=(GPL)
 arch=(any)
 depends=(
diff --git a/setup.py b/setup.py
index 74e87f04..b92e9c34 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def main() -> None:
     setup(
         name="kvmd",
         version="1.4",
-        url="https://github.com/pi-kvm/kvmd",
+        url="https://github.com/pikvm/kvmd",
         license="GPLv3",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",
diff --git a/testenv/Dockerfile b/testenv/Dockerfile
index 8319d385..546cf553 100644
--- a/testenv/Dockerfile
+++ b/testenv/Dockerfile
@@ -30,7 +30,7 @@ RUN npm install htmlhint -g
 ARG USTREAMER_MIN_VERSION
 ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION
 RUN echo $USTREAMER_MIN_VERSION
-RUN git clone https://github.com/pi-kvm/ustreamer \
+RUN git clone https://github.com/pikvm/ustreamer \
 	&& cd ustreamer \
 	&& make PREFIX=/usr install \
 	&& cd - \
diff --git a/web/index.html b/web/index.html
index 72c13d34..5b54afd2 100644
--- a/web/index.html
+++ b/web/index.html
@@ -91,7 +91,7 @@
 			<hr>
 			<p class="text">
 				Full documentation, source code, hardware schematics and legal information
-				can be found in our <a target="_blank" href="https://github.com/pi-kvm">official website</a>.
+				can be found in our <a target="_blank" href="https://pikvm.org">official website</a>.
 			</p>
 		</div>
 	</div>
diff --git a/web/kvm/index.html b/web/kvm/index.html
index 3150a2f6..a2b898f7 100644
--- a/web/kvm/index.html
+++ b/web/kvm/index.html
@@ -587,14 +587,14 @@
 			<hr>
 			<p class="text">
 				Full documentation, source code, hardware schematics and legal information
-				can be found in our <a target="_blank" href="https://github.com/pi-kvm">official website</a>.
+				can be found in our <a target="_blank" href="https://pikvm.org">official website</a>.
 			</p>
 		</div>
 	</div>
 
 	<ul class="footer">
 		<li id="kvmd-meta-server-host" class="footer-left"></li>
-		<li class="footer-right"><a target="_blank" href="https://github.com/pi-kvm">Pi-KVM Project</a></li>
+		<li class="footer-right"><a target="_blank" href="https://pikvm.org">Pi-KVM Project</a></li>
 	</ul>
 </body>
 </html>