diff --git a/packages/albatross.2.2.99~dev/opam b/packages/albatross.2.2.99~dev/opam
new file mode 100644
index 0000000..7c042a6
--- /dev/null
+++ b/packages/albatross.2.2.99~dev/opam
@@ -0,0 +1,60 @@
+opam-version: "2.0"
+maintainer: "Hannes Mehnert <hannes@mehnert.org>"
+authors: ["Hannes Mehnert <hannes@mehnert.org>"]
+homepage: "https://github.com/robur-coop/albatross"
+dev-repo: "git+https://github.com/robur-coop/albatross.git"
+bug-reports: "https://github.com/robur-coop/albatross/issues"
+license: "ISC"
+
+depends: [
+  "ocaml" {>= "4.13.0" & < "5.0.0"}
+  "dune" {>= "2.7.0"}
+  "dune-configurator"
+  "conf-pkg-config" {build}
+  "conf-libnl3" {os = "linux"}
+  "lwt" {>= "3.0.0"}
+  "ipaddr" {>= "5.3.0"}
+  "logs"
+  "bos" {>= "0.2.0"}
+  "ptime"
+  "cmdliner" {>= "1.1.0"}
+  "fmt" {>= "0.8.7"}
+  "x509" {>= "1.0.0"}
+  "tls" {>= "1.0.2"}
+  "tls-lwt" {>= "1.0.2"}
+  "asn1-combinators" {>= "0.3.0"}
+  "duration"
+  "decompress" {>= "1.3.0"}
+  "bigstringaf" {>= "0.2.0"}
+  "metrics" {>= "0.2.0"}
+  "metrics-lwt" {>= "0.2.0"}
+  "metrics-influx" {>= "0.2.0"}
+  "metrics-rusage"
+  "ohex" {>= "0.2.0"}
+  "http-lwt-client" {>= "0.3.0"}
+  "happy-eyeballs-lwt"
+  "solo5-elftool" {>= "0.3"}
+  "fpath" {>= "0.7.3"}
+  "logs-syslog" {>= "0.4.1"}
+  "digestif" {>= "1.2.0"}
+  "alcotest" {with-test}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["sh" "-ex" "packaging/FreeBSD/create_package.sh"] {os = "freebsd"}
+  ["sh" "-ex" "packaging/debian/create_package.sh"] {os-family = "debian" | os-family = "ubuntu"}
+]
+synopsis: "Albatross - orchestrate and manage MirageOS unikernels with Solo5"
+description: """
+The goal of albatross is robust deployment of [MirageOS](https://mirage.io)
+unikernels using [Solo5](https://github.com/solo5/solo5). Resources managed
+by albatross are network interfaces of kind `tap`, which are connected to
+already existing bridges, block devices, memory, and CPU. Each unikernel is
+pinned (`cpuset` / `taskset`) to a specific core.
+"""
+depexts: ["linux-headers"] {os-family = "alpine"}
+url {
+  src: "git+https://github.com/robur-coop/albatross.git"
+}
diff --git a/packages/builder-web.0.2.0~dev/opam b/packages/builder-web.0.2.0~dev/opam
index 36c8d6a..7f019b1 100644
--- a/packages/builder-web.0.2.0~dev/opam
+++ b/packages/builder-web.0.2.0~dev/opam
@@ -17,18 +17,16 @@ build: [
 depends: [
   "ocaml" {>= "4.13.0" & < "5.0.0"}
   "dune" {>= "2.7.0"}
-  "builder" {>= "0.2.0"}
-  "dream" {>= "1.0.0~alpha4"}
-  "cstruct" {>= "6.0.0"}
+  "builder" {>= "0.4.0"}
+  "dream" {>= "1.0.0~alpha7"}
   "bos"
-  "hex"
+  "ohex" {>= "0.2.0"}
   "lwt" {>= "5.7.0"}
-  "caqti" {>= "2.1.1"}
+  "caqti" {>= "2.1.2"}
   "caqti-lwt"
   "caqti-driver-sqlite3"
-  "pbkdf"
   "mirage-crypto-rng" {>= "0.11.0"}
-  "scrypt-kdf"
+  "kdf"
   "opam-core"
   "opam-format" {>= "2.1.0"}
   "metrics" {>= "0.3.0"}
@@ -39,8 +37,7 @@ depends: [
   "tyxml" {>= "4.3.0"}
   "ptime"
   "duration"
-  "mirage-crypto"
-  "asn1-combinators"
+  "asn1-combinators" {>= "0.3.0"}
   "logs"
   "cmdliner" {>= "1.1.0"}
   "uri"
@@ -51,9 +48,11 @@ depends: [
   "owee"
   "solo5-elftool" {>= "0.3.0"}
   "decompress" {>= "1.5.0"}
+  "digestif" {>= "1.2.0"}
   "alcotest" {>= "1.2.0" & with-test}
   "ppx_deriving" {with-test}
   "ppx_deriving_yojson" {with-test}
+  "yojson" {with-test}
 ]
 
 synopsis: "Web interface for builder"
@@ -62,7 +61,6 @@ Builder-web takes in submissions of builds, typically from [builder](https://git
 Produced binaries can be downloaded and executed.
 [builds.robur.coop](https://builds.robur.coop/) itself runs builder-web.
 """
-
 url {
   src: "git+https://github.com/robur-coop/builder-web.git"
 }
diff --git a/packages/builder.0.3.99~dev/opam b/packages/builder.0.4.99~dev/opam
similarity index 86%
rename from packages/builder.0.3.99~dev/opam
rename to packages/builder.0.4.99~dev/opam
index 75ea149..daebc11 100644
--- a/packages/builder.0.3.99~dev/opam
+++ b/packages/builder.0.4.99~dev/opam
@@ -7,13 +7,12 @@ bug-reports: "https://github.com/robur-coop/builder/issues"
 license: "ISC"
 
 depends: [
-  "ocaml" {>= "4.08.0" & < "5.0.0"}
+  "ocaml" {>= "4.13.0" & < "5.0.0"}
   "dune" {>= "2.0.0"}
-  "asn1-combinators"
+  "asn1-combinators" {>= "0.3.0"}
   "bheap" {>= "2.0.0"}
   "bos"
   "cmdliner" {>= "1.1.0"}
-  "cstruct" {>= "6.0.0"}
   "duration"
   "fmt" {>= "0.8.7"}
   "fpath"
@@ -21,7 +20,7 @@ depends: [
   "lwt"
   "ptime"
   "uuidm"
-  "http-lwt-client" {>= "0.2.0"}
+  "http-lwt-client" {>= "0.3.0"}
   "base64"
 ]
 build: [
@@ -44,5 +43,5 @@ on the local file system or upload them to a remote server via http.
 See https://builds.robur.coop for the live web frontend (builder-web).
 """
 url {
-  src: "git+https://github.com/robur-coop/builder.git#6a2682c26259ebe8a05c671ce526d1e23c76f7ea"
+  src: "git+https://github.com/robur-coop/builder.git"
 }