diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10cffb877..1eb65fdd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ set(USE_services "" CACHE STRING "Select the services module to use")
 ### Calamares application info
 #
 set(CALAMARES_ORGANIZATION_NAME "Calamares")
-set(CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares")
+set(CALAMARES_ORGANIZATION_DOMAIN "calamares.io")
 set(CALAMARES_APPLICATION_NAME "Calamares")
 set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework")
 
diff --git a/io.calamares.calamares.appdata.xml b/io.calamares.calamares.appdata.xml
index 9b1f883bd..d75954326 100644
--- a/io.calamares.calamares.appdata.xml
+++ b/io.calamares.calamares.appdata.xml
@@ -17,9 +17,9 @@
     <p>Calamares is an installer program for Linux distributions.</p>
     <p xml:lang="nl">Calamares is een installatieprogramma voor Linux distributies.</p>
   </description>
-  <url type="homepage">https://calamares.io</url>
-  <url type="bugtracker">https://https://github.com/calamares/calamares/issues/</url>
-  <url type="help">https://github.com/calamares/calamares/wiki</url>
+  <url type="homepage">https://calamares.io/</url>
+  <url type="bugtracker">https://codeberg.org/Calamares/calamares/issues/</url>
+  <url type="help">https://calamares.io/docs/users-guide/</url>
   <screenshots>
     <screenshot type="default">
       <caption>Calamares Welcome</caption>