diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armhf b/components/packaging/deb/debian-jessie/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/debian-jessie/Dockerfile.armhf
rename to components/packaging/deb/debian-jessie/Dockerfile.armv7l
diff --git a/components/packaging/deb/debian-jessie/Dockerfile.amd64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/debian-jessie/Dockerfile.amd64
rename to components/packaging/deb/debian-jessie/Dockerfile.x86_64
diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armhf b/components/packaging/deb/debian-stretch/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/debian-stretch/Dockerfile.armhf
rename to components/packaging/deb/debian-stretch/Dockerfile.armv7l
diff --git a/components/packaging/deb/debian-stretch/Dockerfile.amd64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/debian-stretch/Dockerfile.amd64
rename to components/packaging/deb/debian-stretch/Dockerfile.x86_64
diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.armhf b/components/packaging/deb/debian-wheezy/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/debian-wheezy/Dockerfile.armhf
rename to components/packaging/deb/debian-wheezy/Dockerfile.armv7l
diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.amd64 b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/debian-wheezy/Dockerfile.amd64
rename to components/packaging/deb/debian-wheezy/Dockerfile.x86_64
diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/ubuntu-trusty/Dockerfile.armhf
rename to components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l
diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/ubuntu-trusty/Dockerfile.amd64
rename to components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64
diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/ubuntu-xenial/Dockerfile.armhf
rename to components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l
diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/ubuntu-xenial/Dockerfile.amd64
rename to components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64
diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf
rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l
diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 b/components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64
rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64
diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l
similarity index 100%
rename from components/packaging/deb/ubuntu-zesty/Dockerfile.armhf
rename to components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l
diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64
similarity index 100%
rename from components/packaging/deb/ubuntu-zesty/Dockerfile.amd64
rename to components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64