diff --git a/Cargo.lock b/Cargo.lock
index 66a2f27b45..3fd74c3e2b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3695,7 +3695,7 @@ dependencies = [
 [[package]]
 name = "specs-idvs"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/specs-idvs.git#530ebb00b60685d6d1f47a3bc16c5b1f25c5e530"
+source = "git+https://gitlab.com/veloren/specs-idvs.git?branch=specs-git#fcb0b2306b571f62f9f85d89e79e087454d95efd"
 dependencies = [
  "specs",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 589b53ea65..277aa6d984 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,3 @@ debug = false
 [profile.releasedebuginfo]
 inherits =  'release'
 debug = 1
-
-# living on the edge
-[patch.crates-io]
-specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 8059f6abf1..e9b815a568 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -16,7 +16,7 @@ futures-timer = "2.0"
 image = { version = "0.22.5", default-features = false, features = ["png"] }
 num_cpus = "1.10.1"
 tracing = { version = "0.1", default-features = false }
-specs = "0.16.1"
+specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
 vek = { version = "0.11.0", features = ["serde"] }
 hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] }
 authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" }
diff --git a/common/Cargo.toml b/common/Cargo.toml
index b481a0a9ad..eda6f2efcd 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
 no-assets = []
 
 [dependencies]
-specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
+specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-git" }
 
-specs = { version = "0.16.1", features = ["serde", "storage-event-control"] }
+specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
 vek = { version = "0.11.0", features = ["serde"] }
 dot_vox = "4.0"
 image = { version = "0.22.5", default-features = false, features = ["png"] }
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 37c584765a..2a5215866a 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -13,10 +13,10 @@ common = { package = "veloren-common", path = "../common" }
 world = { package = "veloren-world", path = "../world" }
 network = { package = "veloren_network", path = "../network", default-features = false }
 
-specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
+specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-git" }
 
 tracing = "0.1"
-specs = { version = "0.16.1", features = ["shred-derive"] }
+specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
 vek = "0.11.0"
 uvth = "3.1.1"
 futures-util = "0.3"
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 44ff442b1d..9fcc062af1 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -33,8 +33,8 @@ conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "pre-wi
 euc = { git = "https://github.com/zesterer/euc.git" }
 
 # ECS
-specs = "0.16.1"
-specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
+specs = { git = "https://github.com/amethyst/specs.git", rev = "7a2e348ab2223818bad487695c66c43db88050a5" }
+specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "specs-git" }
 
 # Mathematics
 vek = { version = "0.11.0", features = ["serde"] }