diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden
index a6498230adee..dfc3e8bb1d75 100644
--- a/build/fbcode_builder/manifests/eden
+++ b/build/fbcode_builder/manifests/eden
@@ -60,7 +60,7 @@ fbcode/tools/lfs = tools/lfs
 
 [shipit.pathmap.fb=off]
 fbcode/eden/fs/public_autocargo = eden/fs
-fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
+fbcode/eden/scm/public_autocargo = eden/scm
 fbcode/common/rust/shed/hostcaps/public_cargo = common/rust/shed/hostcaps
 fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg
 
@@ -77,9 +77,9 @@ fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/h
 
 [shipit.strip.fb=off]
 ^fbcode/common/rust/shed(?!/public_autocargo).*/Cargo\.toml$
-^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$
 ^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
-^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$
 ^.*/facebook/.*$
 ^.*/fb/.*$
 
diff --git a/build/fbcode_builder/manifests/eden_scm b/build/fbcode_builder/manifests/eden_scm
index 79fea84e7684..13eef4253019 100644
--- a/build/fbcode_builder/manifests/eden_scm
+++ b/build/fbcode_builder/manifests/eden_scm
@@ -32,21 +32,20 @@ fbcode/eden/oss = .
 fbcode/eden = eden
 fbcode/eden/fs/public_autocargo = eden/fs
 fbcode/eden/mononoke/public_autocargo = eden/mononoke
-fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
+fbcode/eden/scm/public_autocargo = eden/scm
 fbcode/tools/lfs = tools/lfs
 # This is to pick up the fb303.thrift stubs
 fbcode/fboss/common = common
 
 [shipit.strip]
-^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$
 ^fbcode/eden/fs/eden-config\.h$
 ^fbcode/eden/fs/py/eden/config\.py$
 ^fbcode/eden/hg-server/.*$
 ^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
 ^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$
-^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$
 ^fbcode/eden/scm/build/.*$
-^fbcode/eden/scm/lib/third-party/rust/.*/Cargo.toml$
 ^fbcode/eden/.*/\.cargo/.*$
 ^.*/facebook/.*$
 ^.*/fb/.*$
@@ -56,8 +55,6 @@ fbcode/fboss/common = common
 [dependencies]
 fb303
 fbthrift
-fb303-source
-fbthrift-source
 python
 rust-shed