diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full
index 92d6700f0b..f8c2efcd0e 100644
--- a/docker/Dockerfile.full
+++ b/docker/Dockerfile.full
@@ -51,21 +51,26 @@ RUN apt-get -y install \
     python3-dev \
     python3-gi \
     python3-gst-1.0 \
-    python3-matplotlib \
-    python3-numpy \
-    python3-opencv \
-    python3-pil \
     python3-pip \
     python3-setuptools \
-    python3-skimage \
     python3-wheel
 
+RUN if [ "$(uname -m)" == "armhf" ]; \
+    then \
+        apt-get -y install \
+        python3-matplotlib \
+        python3-numpy \
+        python3-opencv \
+        python3-pil \
+        python3-skimage; \
+    fi
+
 # python pip
 RUN python3 -m pip install --upgrade pip
 # pyvips is broken on x86 due to mismatch ffi
 # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro
 RUN pip install --force-reinstall --no-binary :all: cffi
-RUN python3 -m pip install aiofiles debugpy typing_extensions typing psutil
+RUN python3 -m pip install aiofiles debugpy typing_extensions psutil
 
 ################################################################
 # End section generated from template/Dockerfile.full.header
diff --git a/docker/template/Dockerfile.full.header b/docker/template/Dockerfile.full.header
index 6e9600d88d..6c406e2827 100644
--- a/docker/template/Dockerfile.full.header
+++ b/docker/template/Dockerfile.full.header
@@ -48,21 +48,26 @@ RUN apt-get -y install \
     python3-dev \
     python3-gi \
     python3-gst-1.0 \
-    python3-matplotlib \
-    python3-numpy \
-    python3-opencv \
-    python3-pil \
     python3-pip \
     python3-setuptools \
-    python3-skimage \
     python3-wheel
 
+RUN if [ "$(uname -m)" == "armhf" ]; \
+    then \
+        apt-get -y install \
+        python3-matplotlib \
+        python3-numpy \
+        python3-opencv \
+        python3-pil \
+        python3-skimage; \
+    fi
+
 # python pip
 RUN python3 -m pip install --upgrade pip
 # pyvips is broken on x86 due to mismatch ffi
 # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro
 RUN pip install --force-reinstall --no-binary :all: cffi
-RUN python3 -m pip install aiofiles debugpy typing_extensions typing psutil
+RUN python3 -m pip install aiofiles debugpy typing_extensions psutil
 
 ################################################################
 # End section generated from template/Dockerfile.full.header