diff --git a/src/bin/repo.rs b/src/bin/repo.rs
index 684c9deed..849f6550f 100644
--- a/src/bin/repo.rs
+++ b/src/bin/repo.rs
@@ -507,6 +507,11 @@ fn parse_args(args: Vec<String>) -> anyhow::Result<(CliConfig, CliCommand, Vec<C
                         }
                     }
                 }
+            } else {
+                if conf.general.repo_binary == Some(true) {
+                    recipe.recipe.source = None;
+                    recipe.recipe.build.set_as_remote();
+                }
             }
         }
     }
diff --git a/src/cook/cook_build.rs b/src/cook/cook_build.rs
index acd349e44..db2338e3e 100644
--- a/src/cook/cook_build.rs
+++ b/src/cook/cook_build.rs
@@ -204,7 +204,7 @@ pub fn build(
         return Ok((stage_dir, auto_deps));
     }
 
-    let source_modified = modified_dir_ignore_git(source_dir)?;
+    let source_modified = modified_dir_ignore_git(source_dir).unwrap_or(SystemTime::UNIX_EPOCH);
     let deps_modified = dep_pkgars
         .iter()
         .map(|(_dep, pkgar)| modified(pkgar))
@@ -220,7 +220,7 @@ pub fn build(
             remove_all(&sysroot_dir)?;
         }
     }
-    if !sysroot_dir.is_dir() {
+    if !sysroot_dir.is_dir() && recipe.build.kind != BuildKind::Remote {
         // Create sysroot.tmp
         let sysroot_dir_tmp = target_dir.join("sysroot.tmp");
         create_dir_clean(&sysroot_dir_tmp)?;