diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index ff69d353..2e3855bf 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_VERSION
 
 # Install apt dependencies (keep in alphabetic order)
 RUN \
-	dpkg --add-architecture i386 && \
+	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile
index 158e19e7..98d70a99 100644
--- a/debian-jessie-buildslave/Dockerfile
+++ b/debian-jessie-buildslave/Dockerfile
@@ -3,7 +3,7 @@ FROM	$USER/debian-jessie-build
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-RUN	dpkg --add-architecture i386 && \
+RUN	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	apt-get update && \
 	apt-get install -y --no-install-recommends \
 		asciidoc \
diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index d7942288..b45c1d3b 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_VERSION
 
 # Install apt dependencies (keep in alphabetic order)
 RUN \
-	dpkg --add-architecture i386 && \
+	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \