diff --git a/packages/xs/xapi-inventory.1.2.3/opam b/packages/xs-extra/xapi-inventory.master/opam
similarity index 67%
rename from packages/xs/xapi-inventory.1.2.3/opam
rename to packages/xs-extra/xapi-inventory.master/opam
index 7b0d0537e..ee539b01b 100644
--- a/packages/xs/xapi-inventory.1.2.3/opam
+++ b/packages/xs-extra/xapi-inventory.master/opam
@@ -27,11 +27,5 @@ build: [
 ]
 dev-repo: "git+http://github.com/xapi-project/xcp-inventory.git"
 url {
-  src:
-    "https://github.com/xapi-project/xcp-inventory/releases/download/v1.2.3/xapi-inventory-1.2.3.tbz"
-  checksum: [
-    "sha256=4e5c700bd228c8f1ba86b8a730f3aa27e7897abf2a289746c4bfab8b787aa3e9"
-    "sha512=d5d96e52bed1905cd3cfc4eba4467ba7f40587cef4a82d423dd1b4748d594da968e95ff7eb5cece5e6ea420694541977c3b06155578629831154cd6d7bbc9b31"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "26e78d63c9462d86bc79865d91dc8e6c0ef96f99"
diff --git a/packages/xs/xapi-rrd.1.11.0/opam b/packages/xs-extra/xapi-rrd.master/opam
similarity index 72%
rename from packages/xs/xapi-rrd.1.11.0/opam
rename to packages/xs-extra/xapi-rrd.master/opam
index 2606150c8..a93dfa505 100644
--- a/packages/xs/xapi-rrd.1.11.0/opam
+++ b/packages/xs-extra/xapi-rrd.master/opam
@@ -34,11 +34,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/xcp-rrd.git"
 url {
-  src:
-    "https://github.com/xapi-project/xcp-rrd/releases/download/v1.11.0/xapi-rrd-1.11.0.tbz"
-  checksum: [
-    "sha256=7d05044c4074981c714fc299722cc916d1f67141622765c47e9915b89014b55e"
-    "sha512=6531b6a6ce18d6677f29b90b69cb7f1e892d75a8c169e95996490ef38fed3d7785babb50812cc3a72d5eea8c1aa52f3340c7f23e7d4a9bbf1d4e6d96dd415fca"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "61d362abe84eefb43c18e392842c5970a937741c"
diff --git a/packages/xs/xapi-stdext-date.4.24.0/opam b/packages/xs-extra/xapi-stdext-date.master/opam
similarity index 64%
rename from packages/xs/xapi-stdext-date.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-date.master/opam
index 4f1d8594d..56c07c189 100644
--- a/packages/xs/xapi-stdext-date.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-date.master/opam
@@ -32,11 +32,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-encodings.4.24.0/opam b/packages/xs-extra/xapi-stdext-encodings.master/opam
similarity index 67%
rename from packages/xs/xapi-stdext-encodings.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-encodings.master/opam
index b75152da6..700a4759e 100644
--- a/packages/xs/xapi-stdext-encodings.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-encodings.master/opam
@@ -33,11 +33,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-pervasives.4.24.0/opam b/packages/xs-extra/xapi-stdext-pervasives.master/opam
similarity index 63%
rename from packages/xs/xapi-stdext-pervasives.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-pervasives.master/opam
index 86cd40e4c..a70082340 100644
--- a/packages/xs/xapi-stdext-pervasives.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-pervasives.master/opam
@@ -30,11 +30,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-std.4.24.0/opam b/packages/xs-extra/xapi-stdext-std.master/opam
similarity index 63%
rename from packages/xs/xapi-stdext-std.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-std.master/opam
index 82eb1945d..fd582aad0 100644
--- a/packages/xs/xapi-stdext-std.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-std.master/opam
@@ -29,11 +29,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-threads.4.24.0/opam b/packages/xs-extra/xapi-stdext-threads.master/opam
similarity index 64%
rename from packages/xs/xapi-stdext-threads.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-threads.master/opam
index 3692ab2af..a5f719098 100644
--- a/packages/xs/xapi-stdext-threads.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-threads.master/opam
@@ -31,11 +31,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-unix.4.24.0/opam b/packages/xs-extra/xapi-stdext-unix.master/opam
similarity index 68%
rename from packages/xs/xapi-stdext-unix.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-unix.master/opam
index 7fa285250..b4f050f9c 100644
--- a/packages/xs/xapi-stdext-unix.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-unix.master/opam
@@ -34,11 +34,5 @@ build: [
 depexts: ["linux-headers"] {os-distribution = "alpine"}
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"
diff --git a/packages/xs/xapi-stdext-zerocheck.4.24.0/opam b/packages/xs-extra/xapi-stdext-zerocheck.master/opam
similarity index 62%
rename from packages/xs/xapi-stdext-zerocheck.4.24.0/opam
rename to packages/xs-extra/xapi-stdext-zerocheck.master/opam
index e9d8c466b..8c5a65c44 100644
--- a/packages/xs/xapi-stdext-zerocheck.4.24.0/opam
+++ b/packages/xs-extra/xapi-stdext-zerocheck.master/opam
@@ -28,11 +28,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/stdext.git"
 url {
-  src:
-    "https://github.com/xapi-project/stdext/releases/download/v4.24.0/xapi-stdext-4.24.0.tbz"
-  checksum: [
-    "sha256=ee495ee5b3c19c60785af88893750f42b6c62a168e8a468be05ab93b14c513d8"
-    "sha512=0977b6e7e7e3346655c28af6d54b1c319130b51a7dbe2423db0825ccd7cb2b0618cdf35a7d0436cfa16165207a8b05c62aec9e515f4f0ca233f250fe2396596f"
-  ]
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
-x-commit-hash: "4cf5cbe00189b9f5ea96a3b0ebf1a8522c8e6399"