diff --git a/.cargo/config b/.cargo/config
index cb3a6ca43da46159d11d39b5bb1f5460b72dc1cb..1f509acb1cbb68ca1b59bf9a6e0d6e2ccf5f423a 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -9,8 +9,3 @@ uc = "update -p duniter-core"
 ug = "update -p duniter-gva"
 ugc = "update -p duniter-gva-conf"
 xtask = "run --package xtask --"
-
-# ARM x64 specific, otherwise crash (because of rustc bug)
-# see: https://github.com/rust-lang/cargo/issues/6489
-[target.'cfg(all(target_arch = "aarch64"))']
-rustflags = ["-Ccodegen-units=1"]
diff --git a/Cargo.toml b/Cargo.toml
index ecbfdbec97b603dad25a4593460c63ce04f0a243..e69d1bd2fdedebdf736a453d54e2e34b4f3b852c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ ctrlc = "3.1.6"
 daemonize-me = "0.3.1"
 dirs = "3.0.1"
 duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] }
+duniter-gva-conf = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
 log = "0.4.11"
 logwatcher = "0.1.1"
 nix = "0.17.0"
@@ -26,9 +27,6 @@ read_input = "0.8.4"
 serde_json = "1.0.53"
 structopt = "0.3.18"
 
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-duniter-gva-conf = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
-
 [dev-dependencies]
 rusty-hook = "0.11.2"
 
diff --git a/rust-libs/duniter-server/Cargo.toml b/rust-libs/duniter-server/Cargo.toml
index 993dac165facf85e18016e63905892c4ec7efb90..bc252da2accb487f1c48d24bc489f82e764cb731 100644
--- a/rust-libs/duniter-server/Cargo.toml
+++ b/rust-libs/duniter-server/Cargo.toml
@@ -9,14 +9,12 @@ edition = "2018"
 anyhow = "1.0.34"
 cfg-if = "1.0.0"
 duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] }
+duniter-gva = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
 fast-threadpool = "0.2.3"
 flume = "0.10.0"
 log = "0.4.11"
 paste = "1.0.2"
 resiter = "0.4.0"
 
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-duniter-gva = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
-
 [dev-dependencies]
 duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer", "mem"] }
diff --git a/rust-libs/duniter-server/src/lib.rs b/rust-libs/duniter-server/src/lib.rs
index 1d9960210aeadcf5413020160414abd97e41a836..72ab2464c962a7d618f557cc72b447dd4ca7ff0c 100644
--- a/rust-libs/duniter-server/src/lib.rs
+++ b/rust-libs/duniter-server/src/lib.rs
@@ -30,7 +30,6 @@ use duniter_core::dbs::databases::{bc_v2::BcV2DbReadable, network_v1::NetworkV1D
 pub use duniter_core::dbs::{
     kv_typed::prelude::KvResult, smallvec, DunpHeadDbV1, DunpNodeIdV1Db, PeerCardDbV1,
 };
-#[cfg(target_arch = "x86_64")]
 pub use duniter_gva::GvaModule;
 
 use anyhow::Context;
@@ -60,14 +59,8 @@ use std::{
 use duniter_core::conf as duniter_conf;
 use duniter_core::global as duniter_global;
 use duniter_core::mempools as duniter_mempools;
-cfg_if::cfg_if! {
-    if #[cfg(target_arch = "x86_64")] {
-        use duniter_core::module::DuniterModule;
-        plug_duniter_modules!([GvaModule], TxsHistoryForBma);
-    } else {
-        plug_duniter_modules!([], TxsHistoryForBma);
-    }
-}
+use duniter_core::module::DuniterModule;
+plug_duniter_modules!([GvaModule], TxsHistoryForBma);
 
 pub struct DuniterServer {
     bc_db: BcV2Db<FileBackend>,