diff --git a/dune-project b/dune-project
index c380042d..e60f4506 100644
--- a/dune-project
+++ b/dune-project
@@ -28,16 +28,6 @@
  (synopsis "An actor-model multi-core scheduler for OCaml 5")
  (description
   "Riot is an actor-model multi-core scheduler for OCaml 5. It brings Erlang-style concurrency to the language, where lighweight process communicate via message passing")
- (depends
-  (riot_runtime (= :version))
-  (riot_stdlib (= :version))
-  dune
-  )
- (tags
-  (multicore erlang actor "message-passing" processes)))
-
-(package
- (name riot_runtime)
  (depends
   bytestring 
   (castore (and :with-test (>= "0.0.2")))
@@ -57,12 +47,3 @@
   dune)
  (tags
   (multicore erlang actor "message-passing" processes)))
-
-(package
- (name riot_stdlib)
- (depends
-  (riot_runtime (= :version))
-  dune
-  )
- (tags
-  (multicore erlang actor "message-passing" processes)))
diff --git a/packages/riot-runtime/dune b/packages/riot-runtime/dune
index e1a89250..ef2c1421 100644
--- a/packages/riot-runtime/dune
+++ b/packages/riot-runtime/dune
@@ -1,7 +1,8 @@
 (include_subdirs qualified)
 
 (library
- (public_name riot_runtime)
+ (package riot)
+ (name riot_runtime)
  (libraries
   bytestring
   gluon
diff --git a/packages/riot-stdlib/dune b/packages/riot-stdlib/dune
index d3f5efb7..6f3e9f13 100644
--- a/packages/riot-stdlib/dune
+++ b/packages/riot-stdlib/dune
@@ -1,5 +1,6 @@
 (include_subdirs qualified)
 
 (library
- (public_name riot_stdlib)
+ (package riot)
+ (name riot_stdlib)
  (libraries riot_runtime))
diff --git a/riot.opam b/riot.opam
index 9917564c..afd9f3bc 100644
--- a/riot.opam
+++ b/riot.opam
@@ -10,10 +10,22 @@ tags: ["multicore" "erlang" "actor" "message-passing" "processes"]
 homepage: "https://github.com/riot-ml/riot"
 bug-reports: "https://github.com/riot-ml/riot/issues"
 depends: [
-  "riot_runtime" {= version}
-  "riot_stdlib" {= version}
+  "bytestring"
+  "castore" {with-test & >= "0.0.2"}
+  "config" {>= "0.0.1"}
+  "gluon" {>= "0.0.1"}
+  "mdx" {with-test & >= "2.3.1"}
+  "mirage-crypto" {>= "0.11.2"}
+  "mirage-crypto-rng" {>= "0.11.2"}
+  "mtime" {>= "2.0.0"}
+  "ocaml" {>= "5.1"}
+  "odoc" {with-doc & >= "2.2.2"}
+  "ptime" {>= "1.1.0"}
+  "rio"
+  "telemetry" {>= "0.0.1"}
+  "tls" {>= "1.0.0"}
+  "uri" {>= "4.4.0"}
   "dune" {>= "3.11"}
-  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/riot_runtime.opam b/riot_runtime.opam
deleted file mode 100644
index bd2538aa..00000000
--- a/riot_runtime.opam
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-maintainer: ["Leandro Ostera <leandro@abstractmachines.dev>"]
-authors: ["Leandro Ostera <leandro@abstractmachines.dev>"]
-license: "MIT"
-tags: ["multicore" "erlang" "actor" "message-passing" "processes"]
-homepage: "https://github.com/riot-ml/riot"
-bug-reports: "https://github.com/riot-ml/riot/issues"
-depends: [
-  "bytestring"
-  "castore" {with-test & >= "0.0.2"}
-  "config" {>= "0.0.1"}
-  "gluon" {>= "0.0.1"}
-  "mdx" {with-test & >= "2.3.1"}
-  "mirage-crypto" {>= "0.11.2"}
-  "mirage-crypto-rng" {>= "0.11.2"}
-  "mtime" {>= "2.0.0"}
-  "ocaml" {>= "5.1"}
-  "odoc" {with-doc & >= "2.2.2"}
-  "ptime" {>= "1.1.0"}
-  "rio"
-  "telemetry" {>= "0.0.1"}
-  "tls" {>= "1.0.0"}
-  "uri" {>= "4.4.0"}
-  "dune" {>= "3.11"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/riot-ml/riot.git"
diff --git a/riot_stdlib.opam b/riot_stdlib.opam
deleted file mode 100644
index 2eddc88b..00000000
--- a/riot_stdlib.opam
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-maintainer: ["Leandro Ostera <leandro@abstractmachines.dev>"]
-authors: ["Leandro Ostera <leandro@abstractmachines.dev>"]
-license: "MIT"
-tags: ["multicore" "erlang" "actor" "message-passing" "processes"]
-homepage: "https://github.com/riot-ml/riot"
-bug-reports: "https://github.com/riot-ml/riot/issues"
-depends: [
-  "riot_runtime" {= version}
-  "dune" {>= "3.11"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/riot-ml/riot.git"