diff --git a/dune-project b/dune-project
index 6d0c661ee31..fde96410f19 100644
--- a/dune-project
+++ b/dune-project
@@ -321,6 +321,32 @@
 
 (package
   (name vhd-tool)
+  (synopsis "Manipulate .vhd files")
+  (tags ("org.mirage" "org:xapi-project"))
+  (depends
+    (alcotest-lwt :with-test)
+    cohttp-lwt
+    conf-libssl
+    (cstruct (>= "3.0.0"))
+    (ezxenstore (= :version))
+    (forkexec (= :version))
+    io-page
+    lwt
+    nbd-unix
+    ppx_cstruct
+    ppx_deriving_rpc
+    re
+    rpclib
+    sha
+    tar
+    (vhd-format (= :version))
+    (vhd-format-lwt (= :version))
+    (xapi-idl (= :version))
+    (xapi-log (= :version))
+    (xen-api-client-lwt (= :version))
+    xenstore
+    xenstore_transport
+  )
 )
 
 (package
diff --git a/vhd-tool.opam b/vhd-tool.opam
index c1f8135c98d..9549a608df3 100644
--- a/vhd-tool.opam
+++ b/vhd-tool.opam
@@ -1,25 +1,20 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "xen-api@lists.xen.org"
-authors: [ "xen-api@lists.xen.org" ]
-homepage: "https://github.com/xapi-project/xen-api"
+synopsis: "Manipulate .vhd files"
+maintainer: ["Xapi project maintainers"]
+authors: ["xen-api@lists.xen.org"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+tags: ["org.mirage" "org:xapi-project"]
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [[ "dune" "build" "-p" name "-j" jobs ]
-]
 depends: [
-  "ocaml"
-  "dune"
+  "dune" {>= "3.0"}
   "alcotest-lwt" {with-test}
   "cohttp-lwt"
   "conf-libssl"
   "cstruct" {>= "3.0.0"}
-  "forkexec"
+  "ezxenstore" {= version}
+  "forkexec" {= version}
   "io-page"
   "lwt"
   "nbd-unix"
@@ -29,14 +24,27 @@ depends: [
   "rpclib"
   "sha"
   "tar"
-  "vhd-format"
-  "vhd-format-lwt"
-  "xapi-idl"
-  "xapi-log"
+  "vhd-format" {= version}
+  "vhd-format-lwt" {= version}
+  "xapi-idl" {= version}
+  "xapi-log" {= version}
+  "xen-api-client-lwt" {= version}
   "xenstore"
   "xenstore_transport"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-synopsis: ".vhd file manipulation"
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"
diff --git a/vhd-tool.opam.template b/vhd-tool.opam.template
deleted file mode 100644
index 52cf0e72d43..00000000000
--- a/vhd-tool.opam.template
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-maintainer: "xen-api@lists.xen.org"
-authors: [ "xen-api@lists.xen.org" ]
-homepage: "https://github.com/xapi-project/xen-api"
-bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [[ "dune" "build" "-p" name "-j" jobs ]
-]
-depends: [
-  "ocaml"
-  "dune"
-  "alcotest-lwt" {with-test}
-  "cohttp-lwt"
-  "conf-libssl"
-  "cstruct" {>= "3.0.0"}
-  "forkexec"
-  "io-page"
-  "lwt"
-  "nbd-unix"
-  "ppx_cstruct"
-  "ppx_deriving_rpc"
-  "re"
-  "rpclib"
-  "sha"
-  "tar"
-  "vhd-format"
-  "vhd-format-lwt"
-  "xapi-idl"
-  "xapi-log"
-  "xenstore"
-  "xenstore_transport"
-]
-synopsis: ".vhd file manipulation"
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}