diff --git a/Cargo.lock b/Cargo.lock
index f4703b2..fcf78a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -570,9 +570,9 @@ dependencies = [
 
 [[package]]
 name = "multiaddr"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8d2f5ee4645ab2c09b846006f3bb0916e728a0384982544dba553be727d772"
+checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
 dependencies = [
  "arrayref",
  "byteorder",
@@ -1212,7 +1212,7 @@ dependencies = [
 
 [[package]]
 name = "waku-sys"
-version = "0.1.0"
+version = "0.1.0-beta1"
 dependencies = [
  "bindgen",
 ]
diff --git a/waku-bindings/Cargo.toml b/waku-bindings/Cargo.toml
index b4e9279..8784ebb 100644
--- a/waku-bindings/Cargo.toml
+++ b/waku-bindings/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["network-programming"]
 aes-gcm = { version = "0.10", features = ["aes"] }
 base64 = "0.13"
 hex = "0.4"
-multiaddr = "0.15"
+multiaddr = "0.16"
 once_cell = "1.15"
 rand = "0.8"
 secp256k1 = { version = "0.24", features = ["rand", "recovery", "serde"] }
@@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sscanf = "0.3"
 url = "2.3"
-waku-sys = "0.1"
+waku-sys = { version = "0.1.0-beta1", path = "../waku-sys" }
diff --git a/waku-sys/Cargo.toml b/waku-sys/Cargo.toml
index fa94926..3f05491 100644
--- a/waku-sys/Cargo.toml
+++ b/waku-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "waku-sys"
-version = "0.1.0"
+version = "0.1.0-beta1"
 edition = "2021"
 authors = [
     "Daniel Sanchez Quiros <danielsq@status.im>"
diff --git a/waku-sys/build.rs b/waku-sys/build.rs
index af75627..838b0e0 100644
--- a/waku-sys/build.rs
+++ b/waku-sys/build.rs
@@ -31,6 +31,7 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
     // Build go-waku static lib
     // build command taken from waku make file:
     // https://github.com/status-im/go-waku/blob/eafbc4c01f94f3096c3201fb1e44f17f907b3068/Makefile#L115
+    let out_dir: PathBuf = env::var_os("OUT_DIR").unwrap().into();
     let vendor_path = project_dir.join("vendor");
     set_current_dir(vendor_path).expect("Moving to vendor dir");
     Command::new(go_bin)
@@ -38,7 +39,7 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
         .arg("build")
         .arg("-buildmode=c-archive")
         .arg("-o")
-        .arg("./build/lib/libgowaku.a")
+        .arg(out_dir.join("libgowaku.a"))
         .arg("./library")
         .status()
         .map_err(|e| println!("cargo:warning=go build failed due to: {}", e))
@@ -46,8 +47,10 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
     set_current_dir(project_dir).expect("Going back to project dir");
 }
 
-fn generate_bindgen_code(project_dir: &Path) {
-    let lib_dir = project_dir.join("vendor/build/lib");
+fn generate_bindgen_code() {
+    let lib_dir: PathBuf = env::var_os("OUT_DIR").unwrap().into();
+
+    // let lib_dir = project_dir.join("vendor/build/lib");
 
     println!("cargo:rustc-link-search={}", lib_dir.display());
     println!("cargo:rustc-link-lib=static=gowaku");
@@ -79,5 +82,5 @@ fn main() {
     let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
 
     build_go_waku_lib(&go_bin, &project_dir);
-    generate_bindgen_code(&project_dir);
+    generate_bindgen_code();
 }