diff --git a/dune-project b/dune-project
index 20044d49199..cd4d286416c 100644
--- a/dune-project
+++ b/dune-project
@@ -225,6 +225,27 @@
 
 (package
   (name xapi-networkd)
+  (authors "Jon Ludlam")
+  (synopsis "The XCP networking daemon")
+  (depends
+    (alcotest :with-test)
+    astring
+    base-threads
+    (forkexec (= :version))
+    (http-lib (= :version))
+    mtime
+    netlink
+    re
+    rpclib
+    (xapi-idl (= :version))
+    xapi-inventory
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-std (= :version))
+    (xapi-stdext-threads (= :version))
+    (xapi-stdext-unix (= :version))
+    xapi-test-utils
+    (xen-api-client (= :version))
+  )
 )
 
 (package
diff --git a/xapi-networkd.opam b/xapi-networkd.opam
index 6a3f122d14f..595478821f2 100644
--- a/xapi-networkd.opam
+++ b/xapi-networkd.opam
@@ -1,37 +1,44 @@
 # 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: "jonathan.ludlam@eu.citrix.com"
-homepage: "https://github.com/xapi-project/xen-api"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
+synopsis: "The XCP networking daemon"
+maintainer: ["Xapi project maintainers"]
+authors: ["Jon Ludlam"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
-  "astring"
+  "dune" {>= "3.0"}
   "alcotest" {with-test}
+  "astring"
   "base-threads"
-  "forkexec"
-  "http-lib"
+  "forkexec" {= version}
+  "http-lib" {= version}
   "mtime"
   "netlink"
   "re"
   "rpclib"
-  "systemd"
-  "xapi-idl"
+  "xapi-idl" {= version}
   "xapi-inventory"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-std"
-  "xapi-stdext-threads"
-  "xapi-stdext-unix"
+  "xapi-stdext-pervasives" {= version}
+  "xapi-stdext-std" {= version}
+  "xapi-stdext-threads" {= version}
+  "xapi-stdext-unix" {= version}
   "xapi-test-utils"
-  "xen-api-client"
+  "xen-api-client" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "The XCP networking daemon"
-url {
-  src:
-    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"
diff --git a/xapi-networkd.opam.template b/xapi-networkd.opam.template
deleted file mode 100644
index b661773e09e..00000000000
--- a/xapi-networkd.opam.template
+++ /dev/null
@@ -1,35 +0,0 @@
-opam-version: "2.0"
-maintainer: "xen-api@lists.xen.org"
-authors: "jonathan.ludlam@eu.citrix.com"
-homepage: "https://github.com/xapi-project/xen-api"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-bug-reports: "https://github.com/xapi-project/xen-api/issues"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-depends: [
-  "astring"
-  "alcotest" {with-test}
-  "base-threads"
-  "forkexec"
-  "http-lib"
-  "mtime"
-  "netlink"
-  "re"
-  "rpclib"
-  "systemd"
-  "xapi-idl"
-  "xapi-inventory"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-std"
-  "xapi-stdext-threads"
-  "xapi-stdext-unix"
-  "xapi-test-utils"
-  "xen-api-client"
-]
-synopsis: "The XCP networking daemon"
-url {
-  src:
-    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}