diff --git a/nfpm/arbitrator.yaml b/nfpm/arbitrator.yaml
index 9312dc0fb..b8a300788 100644
--- a/nfpm/arbitrator.yaml
+++ b/nfpm/arbitrator.yaml
@@ -4,7 +4,7 @@ release: 1
 maintainer: "Guillaume Lefranc <guillaume@signal18.io>"
 description: "Replication Manager for MariaDB and MySQL - arbitrator package"
 license: "GPLv3"
-arch: amd64
+arch: ${architecture}
 platform: linux
 contents:
   - src: build/binaries/replication-manager-arb
diff --git a/nfpm/client.yaml b/nfpm/client.yaml
index 52d6afc21..39d1a0b1f 100644
--- a/nfpm/client.yaml
+++ b/nfpm/client.yaml
@@ -3,7 +3,7 @@ version: ${version}
 maintainer: "Guillaume Lefranc <guillaume@signal18.io>"
 description: "Replication Manager for MariaDB and MySQL - client package"
 license: "GPLv3"
-arch: amd64
+arch: ${architecture}
 platform: linux
 contents:
   - src: build/binaries/replication-manager-cli
diff --git a/nfpm/osc.yaml b/nfpm/osc.yaml
index 18f1189ea..232f3808c 100644
--- a/nfpm/osc.yaml
+++ b/nfpm/osc.yaml
@@ -4,7 +4,7 @@ release: 1
 maintainer: "Guillaume Lefranc <guillaume@signal18.io>"
 description: "Replication Manager for MariaDB and MySQL - open source core"
 license: "GPLv3"
-arch: amd64
+arch: ${architecture}
 platform: linux
 contents:
   - src: build/binaries/replication-manager-osc
@@ -23,4 +23,4 @@ contents:
     type: tree
 
 scripts:
-  postinstall: ./scripts/post_install.sh
\ No newline at end of file
+  postinstall: ./scripts/post_install.sh
diff --git a/nfpm/prov.yaml b/nfpm/prov.yaml
index 858b34291..582373a3c 100644
--- a/nfpm/prov.yaml
+++ b/nfpm/prov.yaml
@@ -3,7 +3,7 @@ version: ${version}
 maintainer: "Guillaume Lefranc <guillaume@signal18.io>"
 description: "Replication Manager for MariaDB and MySQL - provisioning version"
 license: "GPLv3"
-arch: amd64
+arch: ${architecture}
 platform: linux
 contents:
   - src: build/binaries/replication-manager-pro