diff --git a/Cargo.lock b/Cargo.lock
index be69da55..3824a680 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -867,7 +867,6 @@ dependencies = [
 [[package]]
 name = "clipboard_macos"
 version = "0.1.0"
-source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
 dependencies = [
  "objc",
  "objc-foundation",
@@ -877,7 +876,6 @@ dependencies = [
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.2"
-source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
 dependencies = [
  "dnd",
  "mime 0.1.0",
@@ -1376,8 +1374,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-comp-config"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-comp.git?rev=5eb5af4#5eb5af46756f2f2bc5e812cf68fe4c4b79efd924"
+version = "1.0.0"
 dependencies = [
  "cosmic-config",
  "input",
@@ -1557,7 +1554,6 @@ dependencies = [
 [[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",
@@ -2042,7 +2038,6 @@ dependencies = [
 [[package]]
 name = "dnd"
 version = "0.1.0"
-source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
 dependencies = [
  "bitflags 2.11.1",
  "mime 0.1.0",
@@ -3699,9 +3694,9 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
+checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d"
 dependencies = [
  "bitflags 2.11.1",
  "input-sys",
@@ -4352,7 +4347,6 @@ dependencies = [
 [[package]]
 name = "mime"
 version = "0.1.0"
-source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
 dependencies = [
  "smithay-clipboard",
 ]
@@ -7416,7 +7410,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "window_clipboard"
 version = "0.4.1"
-source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
diff --git a/Cargo.toml b/Cargo.toml
index e713c6e6..5dd5cd88 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,6 +48,7 @@ cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features =
     "desktop-systemd-scope",
     "winit",
 ] }
+cosmic-comp-config = { path = "../cosmic-comp/cosmic-comp-config" }
 rust-embed = "8.11.0"
 rust-embed-utils = "8.11.0"
 rustc-hash = "2.1"
diff --git a/cosmic-applet-input-sources/Cargo.toml b/cosmic-applet-input-sources/Cargo.toml
index dcc72906..046a3bfb 100644
--- a/cosmic-applet-input-sources/Cargo.toml
+++ b/cosmic-applet-input-sources/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 license = "GPL-3.0-only"
 
 [dependencies]
-cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" }
+cosmic-comp-config.workspace = true
 i18n-embed-fl.workspace = true
 i18n-embed.workspace = true
 cosmic.workspace = true
diff --git a/cosmic-applet-tiling/Cargo.toml b/cosmic-applet-tiling/Cargo.toml
index 75dffc68..894be7d4 100644
--- a/cosmic-applet-tiling/Cargo.toml
+++ b/cosmic-applet-tiling/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-only"
 cosmic.workspace = true
 anyhow.workspace = true
 cctk.workspace = true
-cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" }
+cosmic-comp-config.workspace = true
 cosmic-protocols.workspace = true
 i18n-embed-fl.workspace = true
 i18n-embed.workspace = true