diff --git a/xdge.opam b/xdge.opam
index 7465d56..c1b41b0 100644
--- a/xdge.opam
+++ b/xdge.opam
@@ -19,18 +19,10 @@ depends: [
   "odoc" {with-doc}
   "alcotest" {with-test & >= "1.7.0"}
 ]
+x-maintenance-intent: ["(latest)"]
 build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
+  [ "dune" "subst" ] {dev}
+  [ "dune" "build" "-p" name "-j" jobs "@install" ]
+  [ "dune" "build" "-p" name "-j" jobs "runtest" ] {with-test & opam-version >= "2.2" }
+  [ "dune" "build" "@doc" ] {with-doc}
 ]
-x-maintenance-intent: ["(latest)"]
diff --git a/xdge.opam.template b/xdge.opam.template
new file mode 100644
index 0000000..5abc5ed
--- /dev/null
+++ b/xdge.opam.template
@@ -0,0 +1,6 @@
+build: [
+  [ "dune" "subst"                                ] {dev}
+  [ "dune" "build" "-p" name "-j" jobs "@install" ]
+  [ "dune" "build" "-p" name "-j" jobs "runtest"  ] {with-test & opam-version >= "2.2"}
+  [ "dune" "build" "-p" name "-j" jobs "@doc"     ] {with-doc}
+]