diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json
index 1faeeb8..c93a3b6 100644
--- a/pkgs/_sources_nextcloud/generated.json
+++ b/pkgs/_sources_nextcloud/generated.json
@@ -8,9 +8,9 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-2y2FHxli9mqlPvw9mABi09Z96OfB1AFD+XmuV5aOCxY=",
+            "sha256": "sha256-p3VWxTYDCO2NePq6oLM8tBVqYkvoB7itqxp7IZwGDnE=",
             "type": "url",
-            "url": "https://github.com/juliushaertl/apporder/archive/v0.15.0.tar.gz"
+            "url": "https://github.com/juliushaertl/apporder/releases/download/v0.15.0/apporder.tar.gz"
         },
         "version": "v0.15.0"
     },
@@ -23,11 +23,11 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-X6Mg0jQ8EYPctiZ3tDtG4LUPwXRnDj9CJrJZrUs3Z/8=",
+            "sha256": "sha256-URqtzaCx8FEZHCDP1wSBUFNs+x50jesRtWi+xOU1oXM=",
             "type": "url",
-            "url": "https://github.com/nextcloud/bookmarks/archive/v11.0.4.tar.gz"
+            "url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz"
         },
-        "version": "v11.0.4"
+        "version": "11.0.4"
     },
     "calendar": {
         "cargoLocks": null,
@@ -38,9 +38,9 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-keeWi/o+mOV7z5QNATJKwrd0olbCNdrK7YpGHg9qolk=",
+            "sha256": "sha256-+LRGl9h40AQdWN9SW+NqGwTafAGwV07Af8nVs3pUCm0=",
             "type": "url",
-            "url": "https://github.com/nextcloud-releases/calendar/archive/v3.5.0.tar.gz"
+            "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.0/calendar-v3.5.0.tar.gz"
         },
         "version": "v3.5.0"
     },
@@ -53,9 +53,9 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-4dEEy8zSjZYsClO6u+oWfvIlPYJq9+m1+a/mHTQRlaY=",
+            "sha256": "sha256-GTiyZsUHBXPgQ17DHAihmt2W/ZnAjDwfgwnujkRwk6A=",
             "type": "url",
-            "url": "https://github.com/nextcloud-releases/contacts/archive/v4.2.2.tar.gz"
+            "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz"
         },
         "version": "v4.2.2"
     },
@@ -68,11 +68,11 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-TkUCCa7wP6leQbTsxKgD21Tf9CONVnbmvXCFhVBITZw=",
+            "sha256": "sha256-v64rLGyMQOdStyivpJsKrNxwumVQvyK3CnHtZ+K+elE=",
             "type": "url",
-            "url": "https://github.com/nextcloud/cookbook/archive/v0.9.15.tar.gz"
+            "url": "https://github.com/nextcloud/cookbook/releases/download/v0.9.15/Cookbook-0.9.15.tar.gz"
         },
-        "version": "v0.9.15"
+        "version": "0.9.15"
     },
     "news": {
         "cargoLocks": null,
@@ -83,11 +83,11 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-eS0cFwJmYfGGJmA02AOWO/OXfqfyI71u2GataDj18DE=",
+            "sha256": "sha256-O6gaA+EN10dkfbDw5i6jV1NEyR4UP22Jj2DnWEzUcGg=",
             "type": "url",
-            "url": "https://github.com/nextcloud/news/releases/download/18.2.0/news.tar.gz"
+            "url": "https://github.com/nextcloud/news/releases/download/18.3.0/news.tar.gz"
         },
-        "version": "18.2.0"
+        "version": "18.3.0"
     },
     "notes": {
         "cargoLocks": null,
@@ -98,9 +98,9 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-qhhaQyb9LgLza4CAcNZbl97xa271M7Wqmw8TtBEFpXk=",
+            "sha256": "sha256-rd3uVkVtARX4enRAWm1ivV468lboYZnYe7/zsqaHYpk=",
             "type": "url",
-            "url": "https://github.com/nextcloud/notes/archive/v4.5.1.tar.gz"
+            "url": "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz"
         },
         "version": "v4.5.1"
     }
diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix
index 5da7ca4..cb0c294 100644
--- a/pkgs/_sources_nextcloud/generated.nix
+++ b/pkgs/_sources_nextcloud/generated.nix
@@ -5,56 +5,56 @@
     pname = "apporder";
     version = "v0.15.0";
     src = fetchurl {
-      url = "https://github.com/juliushaertl/apporder/archive/v0.15.0.tar.gz";
-      sha256 = "sha256-2y2FHxli9mqlPvw9mABi09Z96OfB1AFD+XmuV5aOCxY=";
+      url = "https://github.com/juliushaertl/apporder/releases/download/v0.15.0/apporder.tar.gz";
+      sha256 = "sha256-p3VWxTYDCO2NePq6oLM8tBVqYkvoB7itqxp7IZwGDnE=";
     };
   };
   bookmarks = {
     pname = "bookmarks";
-    version = "v11.0.4";
+    version = "11.0.4";
     src = fetchurl {
-      url = "https://github.com/nextcloud/bookmarks/archive/v11.0.4.tar.gz";
-      sha256 = "sha256-X6Mg0jQ8EYPctiZ3tDtG4LUPwXRnDj9CJrJZrUs3Z/8=";
+      url = "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz";
+      sha256 = "sha256-URqtzaCx8FEZHCDP1wSBUFNs+x50jesRtWi+xOU1oXM=";
     };
   };
   calendar = {
     pname = "calendar";
     version = "v3.5.0";
     src = fetchurl {
-      url = "https://github.com/nextcloud-releases/calendar/archive/v3.5.0.tar.gz";
-      sha256 = "sha256-keeWi/o+mOV7z5QNATJKwrd0olbCNdrK7YpGHg9qolk=";
+      url = "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.0/calendar-v3.5.0.tar.gz";
+      sha256 = "sha256-+LRGl9h40AQdWN9SW+NqGwTafAGwV07Af8nVs3pUCm0=";
     };
   };
   contacts = {
     pname = "contacts";
     version = "v4.2.2";
     src = fetchurl {
-      url = "https://github.com/nextcloud-releases/contacts/archive/v4.2.2.tar.gz";
-      sha256 = "sha256-4dEEy8zSjZYsClO6u+oWfvIlPYJq9+m1+a/mHTQRlaY=";
+      url = "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz";
+      sha256 = "sha256-GTiyZsUHBXPgQ17DHAihmt2W/ZnAjDwfgwnujkRwk6A=";
     };
   };
   cookbook = {
     pname = "cookbook";
-    version = "v0.9.15";
+    version = "0.9.15";
     src = fetchurl {
-      url = "https://github.com/nextcloud/cookbook/archive/v0.9.15.tar.gz";
-      sha256 = "sha256-TkUCCa7wP6leQbTsxKgD21Tf9CONVnbmvXCFhVBITZw=";
+      url = "https://github.com/nextcloud/cookbook/releases/download/v0.9.15/Cookbook-0.9.15.tar.gz";
+      sha256 = "sha256-v64rLGyMQOdStyivpJsKrNxwumVQvyK3CnHtZ+K+elE=";
     };
   };
   news = {
     pname = "news";
-    version = "18.2.0";
+    version = "18.3.0";
     src = fetchurl {
-      url = "https://github.com/nextcloud/news/releases/download/18.2.0/news.tar.gz";
-      sha256 = "sha256-eS0cFwJmYfGGJmA02AOWO/OXfqfyI71u2GataDj18DE=";
+      url = "https://github.com/nextcloud/news/releases/download/18.3.0/news.tar.gz";
+      sha256 = "sha256-O6gaA+EN10dkfbDw5i6jV1NEyR4UP22Jj2DnWEzUcGg=";
     };
   };
   notes = {
     pname = "notes";
     version = "v4.5.1";
     src = fetchurl {
-      url = "https://github.com/nextcloud/notes/archive/v4.5.1.tar.gz";
-      sha256 = "sha256-qhhaQyb9LgLza4CAcNZbl97xa271M7Wqmw8TtBEFpXk=";
+      url = "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz";
+      sha256 = "sha256-rd3uVkVtARX4enRAWm1ivV468lboYZnYe7/zsqaHYpk=";
     };
   };
 }
diff --git a/pkgs/nextcloud-apps.toml b/pkgs/nextcloud-apps.toml
index 6d49d79..0620299 100644
--- a/pkgs/nextcloud-apps.toml
+++ b/pkgs/nextcloud-apps.toml
@@ -1,24 +1,26 @@
 [apporder]
 src.github = "juliushaertl/apporder"
-fetch.url = "https://github.com/juliushaertl/apporder/archive/$ver.tar.gz"
+fetch.url = "https://github.com/juliushaertl/apporder/releases/download/$ver/apporder.tar.gz"
 
 [bookmarks]
 src.github = "nextcloud/bookmarks"
-fetch.url = "https://github.com/nextcloud/bookmarks/archive/$ver.tar.gz"
+src.prefix = "v"
+fetch.url = "https://github.com/nextcloud/bookmarks/releases/download/v$ver/bookmarks-$ver.tar.gz"
 
 [calendar]
 src.manual = "v3.5.0" # Pinned until we update to nextcloud 25
 # src.github = "nextcloud-releases/calendar"
-fetch.url = "https://github.com/nextcloud-releases/calendar/archive/$ver.tar.gz"
+fetch.url = "https://github.com/nextcloud-releases/calendar/releases/download/$ver/calendar-$ver.tar.gz"
 
 [contacts]
 src.manual = "v4.2.2" # Pinned until we update to nextcloud 25
 # src.github = "nextcloud-releases/contacts"
-fetch.url = "https://github.com/nextcloud-releases/contacts/archive/$ver.tar.gz"
+fetch.url = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz"
 
 [cookbook]
 src.github = "nextcloud/cookbook"
-fetch.url = "https://github.com/nextcloud/cookbook/archive/$ver.tar.gz"
+src.prefix = "v"
+fetch.url = "https://github.com/nextcloud/cookbook/releases/download/v$ver/Cookbook-$ver.tar.gz"
 
 [news]
 src.github = "nextcloud/news"
@@ -29,4 +31,4 @@ fetch.url = "https://github.com/nextcloud/news/releases/download/$ver/news.tar.g
 [notes]
 src.manual = "v4.5.1" # Pinned until we update to nextcloud 25
 # src.github = "nextcloud/notes"
-fetch.url = "https://github.com/nextcloud/notes/archive/$ver.tar.gz"
+fetch.url = "https://github.com/nextcloud/notes/releases/download/$ver/notes.tar.gz"