diff --git a/Cargo.lock b/Cargo.lock
index f747edaa..de4fd951 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,7 +294,7 @@ dependencies = [
  "futures-lite 2.2.0",
  "parking",
  "polling 3.3.2",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -333,7 +333,7 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -360,7 +360,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -799,6 +799,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "symbolic-debuginfo",
+ "tempfile",
  "zstd",
 ]
 
@@ -2384,7 +2385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
 dependencies = [
  "hermit-abi 0.3.4",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.52.0",
 ]
 
@@ -3773,7 +3774,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -4228,9 +4229,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -4944,14 +4945,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
- "redox_syscall",
- "rustix 0.38.30",
+ "rustix 0.38.31",
  "windows-sys 0.52.0",
 ]
 
@@ -5690,7 +5690,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.30",
+ "rustix 0.38.31",
 ]
 
 [[package]]
@@ -5901,7 +5901,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
  "linux-raw-sys 0.4.13",
- "rustix 0.38.30",
+ "rustix 0.38.31",
 ]
 
 [[package]]
diff --git a/cargo-near/Cargo.toml b/cargo-near/Cargo.toml
index 0ea6ad1f..160de31c 100644
--- a/cargo-near/Cargo.toml
+++ b/cargo-near/Cargo.toml
@@ -47,6 +47,7 @@ interactive-clap = "0.2.8"
 interactive-clap-derive = "0.2.8"
 near-cli-rs = { version = "0.7.7", default-features = false }
 dunce = "1"
+tempfile = "3.10.1"
 
 [features]
 default = ["ledger"]
diff --git a/cargo-near/src/commands/build_command/mod.rs b/cargo-near/src/commands/build_command/mod.rs
index 43e99f10..f417fcd9 100644
--- a/cargo-near/src/commands/build_command/mod.rs
+++ b/cargo-near/src/commands/build_command/mod.rs
@@ -86,23 +86,28 @@ pub fn docker_run(args: BuildCommand) -> color_eyre::eyre::Result<camino::Utf8Pa
         .to_string();
     cargo_args.extend(&["--color", &color]);
 
-    let contract_path: camino::Utf8PathBuf = if let Some(manifest_path) = &args.manifest_path {
+    let mut contract_path: camino::Utf8PathBuf = if let Some(manifest_path) = &args.manifest_path {
         manifest_path.into()
     } else {
         camino::Utf8PathBuf::from_path_buf(std::env::current_dir()?).map_err(|err| {
-            color_eyre::eyre::eyre!("failed to convert path {}", err.to_string_lossy())
+            color_eyre::eyre::eyre!("Failed to convert path {}", err.to_string_lossy())
         })?
     };
 
-    let mut tmp_contract_path = contract_path.clone();
-    tmp_contract_path.push("tmp");
-    let mut clone_contract_cmd = Command::new("cp");
-    clone_contract_cmd.args(["-a", &contract_path.as_str(), &tmp_contract_path.as_str()]);
+    let tmp_contract_dir = tempfile::tempdir()?;
+    let mut tmp_contract_path = tmp_contract_dir.path().to_path_buf();
+
+    let mut clone_contract_cmd = Command::new("git");
+    clone_contract_cmd.args([
+        "clone",
+        &contract_path.as_str(),
+        &tmp_contract_path.to_string_lossy(),
+    ]);
     clone_contract_cmd
         .status()
         .wrap_err("Failed to clone project to temporary directory.")?;
 
-    let volume = format!("{tmp_contract_path}:/host");
+    let volume = format!("{}:/host", tmp_contract_path.to_string_lossy());
     let mut docker_args = vec![
         "--name",
         "cargo-near-container",
@@ -146,9 +151,12 @@ pub fn docker_run(args: BuildCommand) -> color_eyre::eyre::Result<camino::Utf8Pa
 
         for entry in dir.flatten() {
             if entry.path().extension().unwrap().to_str().unwrap() == "wasm" {
-                return camino::Utf8PathBuf::from_path_buf(entry.path()).map_err(|err| {
-                    color_eyre::eyre::eyre!("failed to convert path {}", err.to_string_lossy())
-                });
+                contract_path.push("contract.wasm");
+                let _ = std::fs::rename::<std::path::PathBuf, camino::Utf8PathBuf>(
+                    entry.path(),
+                    contract_path.clone(),
+                );
+                return Ok(contract_path);
             }
         }