diff --git a/Cargo.lock b/Cargo.lock
index 9d11069..d44621e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1540,7 +1540,7 @@ dependencies = [
  "cosmic-settings-accessibility-subscription",
  "cosmic-settings-airplane-mode-subscription",
  "cosmic-settings-bluetooth-subscription",
- "cosmic-settings-config 0.1.0 (git+https://github.com/pop-os/cosmic-settings-daemon)",
+ "cosmic-settings-config",
  "cosmic-settings-daemon-config",
  "cosmic-settings-network-manager-subscription",
  "cosmic-settings-page",
@@ -1660,19 +1660,6 @@ dependencies = [
  "xkbcommon 0.9.0",
 ]
 
-[[package]]
-name = "cosmic-settings-config"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
-dependencies = [
- "cosmic-config",
- "ron 0.11.0",
- "serde",
- "serde_with",
- "tracing",
- "xkbcommon 0.9.0",
-]
-
 [[package]]
 name = "cosmic-settings-daemon"
 version = "0.1.1-yoda.1"
@@ -1683,7 +1670,6 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -4472,7 +4458,7 @@ dependencies = [
  "cosmic-client-toolkit",
  "cosmic-config",
  "cosmic-freedesktop-icons",
- "cosmic-settings-config 0.1.0",
+ "cosmic-settings-config",
  "cosmic-settings-daemon",
  "cosmic-theme",
  "css-color",
diff --git a/Cargo.toml b/Cargo.toml
index 0095e99..d23d770 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,15 +61,12 @@ inherits = "release"
 lto = "off"
 debug = true
 
-# [patch.'https://github.com/pop-os/cosmic-text']
-# cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" }
-
 [patch.'https://github.com/pop-os/cosmic-protocols']
 cosmic-protocols = { path = "../cosmic-protocols" }
 cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
 
 # [patch.'https://github.com/pop-os/cosmic-settings-daemon']
-# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
+# cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
 
 # Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic
 # (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config,
diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml
index 4b20b58..604190b 100644
--- a/cosmic-settings/Cargo.toml
+++ b/cosmic-settings/Cargo.toml
@@ -25,10 +25,10 @@ cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanag
 nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", optional = true }
 cosmic-idle-config.workspace = true
 cosmic-panel-config = { workspace = true, optional = true }
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
+cosmic-protocols = { path = "../../cosmic-protocols", optional = true }
 cosmic-randr-shell.workspace = true
 cosmic-randr = { workspace = true, optional = true }
-cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
+cosmic-settings-config = { path = "../../cosmic-settings-daemon/config", optional = true }
 cosmic-settings-page = { path = "../page" }
 cosmic-settings-accessibility-subscription = { path = "../subscriptions/accessibility", optional = true }
 cosmic-settings-a11y-manager-subscription = { path = "../subscriptions/a11y-manager", optional = true }
@@ -40,7 +40,7 @@ cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional
     "auto-profile-init",
 ] }
 cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
-cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
+cosmic-settings-daemon-config = { path = "../../cosmic-settings-daemon/cosmic-settings-daemon-config", optional = true }
 derive_setters = "0.1.9"
 dirs = "6.0.0"
 eyre = "0.6.12"