diff --git a/packages/xs-extra/xapi-netdev.master/opam b/packages/xs-extra/xapi-netdev.master/opam
index 330ba6c2c..a5d3718c8 100644
--- a/packages/xs-extra/xapi-netdev.master/opam
+++ b/packages/xs-extra/xapi-netdev.master/opam
@@ -1,23 +1,16 @@
 opam-version: "1.2"
+name: "xapi-netdev"
 maintainer: "jonathan.ludlam@citrix.com"
 authors: "xen-api@lists.xen.org"
+license: "LGPL-2.1 with OCaml linking exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/netdev/issues"
 dev-repo: "git://github.com/xapi-project/netdev.git"
-build: [
-  ["oasis" "setup"]
-  [make]
-]
-install: [
-  [make "install" "BINDIR=%{bin}%"]
-]
-remove: [
-  ["ocamlfind" "remove" "netdev"]
-]
+build: [[ "jbuilder" "build" "-p" name "-j" jobs ]]
 available: [ os = "linux" ]
 depends: [
-  "ocamlfind"
-  "xapi-stdext"
-  "xapi-forkexecd"
-  "oasis" {build}
+  "jbuilder" {build}
+  "xapi-stdext-std"
+  "xapi-stdext-unix"
+  "forkexec"
 ]
diff --git a/packages/xs-extra/xapi-plugin.master/opam b/packages/xs-extra/xapi-plugin.master/opam
index 5b9fc6b65..58f43e146 100644
--- a/packages/xs-extra/xapi-plugin.master/opam
+++ b/packages/xs-extra/xapi-plugin.master/opam
@@ -1,16 +1,14 @@
-opam-version: "1"
+opam-version: "1.2"
+name: "xapi-plugin"
 maintainer: "xen-api@lists.xen.org"
-build: [
-  [make]
-  [make "PREFIX=%{prefix}%" "install"]
-]
-remove: [
-  [make "PREFIX=%{prefix}%" "uninstall"]
-  ["ocamlfind" "remove" "worker"]
-]
+authors: "xen-api@lists.xen.org"
+license: "LGPL-2.1 with OCaml linking exception"
+homepage: "https://github.com/xapi-project/ocaml-xapi-plugin"
+dev-repo: "https://github.com/xapi-project/ocaml-xapi-plugin.git"
+bug-reports: "https://github.com/xapi-project/ocaml-xapi-plugin/issues"
+build: [[ "jbuilder" "build" "-p" name "-j" jobs ]]
 depends: [
-  "oasis" {build}
-  "ocamlbuild" {build}
+  "jbuilder" {build}
   "base-unix"
   "rpc"
 ]
diff --git a/packages/xs-extra/xapi-storage-cli.master/opam b/packages/xs-extra/xapi-storage-cli.master/opam
index f99caa2ce..b3d9d11ff 100644
--- a/packages/xs-extra/xapi-storage-cli.master/opam
+++ b/packages/xs-extra/xapi-storage-cli.master/opam
@@ -1,23 +1,14 @@
 opam-version: "1.2"
+name: "xapi-storage-cli"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
+license: "LGPL-2.1 with OCaml linking exception"
 homepage: "https://github.com/xapi-project/sm-cli"
 bug-reports: "https://github.com/xapi-project/sm-cli/issues"
 dev-repo: "https://github.com/xapi-project/sm-cli.git"
-build: [
-  ["oasis" "setup"]
-  ["./configure" "--bindir" "%{bin}%"]
-  [make]
-]
-install: [
-  [make "install"]
-]
-remove: [
-  ["oasis" "setup"]
-  [make "uninstall"]
-]
+build: [[ "jbuilder" "build" "-p" name "-j" jobs ]]
 depends: [
-  "oasis" {build}
+  "jbuilder" {build}
   "base-threads"
   "xapi-idl"
   "re"
diff --git a/packages/xs-extra/xapi-tapctl.master/opam b/packages/xs-extra/xapi-tapctl.master/opam
index 89087d9ed..225c62e6f 100644
--- a/packages/xs-extra/xapi-tapctl.master/opam
+++ b/packages/xs-extra/xapi-tapctl.master/opam
@@ -1,24 +1,18 @@
 opam-version: "1.2"
-maintainer: "jonathan.ludlam@eu.citrix.com"
+name: "xapi-tapctl"
+maintainer: "jonathan.ludlam@citrix.com"
 authors: "xen-api@lists.xen.org"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/tapctl/issues"
 dev-repo: "git://github.com/xapi-project/tapctl.git"
 tags: [ "org:xapi-project" ]
-build: [
-  ["oasis" "setup"]
-  [make]
-]
-install: [
-  [make "install" "BINDIR=%{bin}%"]
-]
-remove: [
-  ["ocamlfind" "remove" "tapctl"]
-]
+build: [[ "jbuilder" "build" "-p" name "-j" jobs ]]
 depends: [
-  "ocamlfind" {build}
-  "oasis" {build}
-  "xapi-stdext" {>= "2.0.0"}
+  "jbuilder" {build}
+  "xapi-stdext-unix"
+  "xapi-stdext-std"
+  "xapi-stdext-threads"
+  "xapi-stdext-monadic"
   "xapi-forkexecd"
   "rpc"
   "base-threads"