diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 084c56cb4..be21da6a4 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,6 +1,8 @@
 FROM resin/rpi-raspbian:stretch
 MAINTAINER Kristian Haugene
 
+RUN [ "cross-build-start" ]
+
 VOLUME /data
 VOLUME /config
 
@@ -123,3 +125,5 @@ ENV OPENVPN_USERNAME=**None** \
 # Expose port and run
 EXPOSE 9091
 CMD ["dumb-init", "/etc/openvpn/start.sh"]
+
+RUN [ "cross-build-end" ]
diff --git a/plugins/rss/Dockerfile.armhf b/plugins/rss/Dockerfile.armhf
index 152674f61..6717caf3d 100644
--- a/plugins/rss/Dockerfile.armhf
+++ b/plugins/rss/Dockerfile.armhf
@@ -1,6 +1,8 @@
 FROM resin/rpi-raspbian:stretch
 MAINTAINER Kristian Haugene
 
+RUN [ "cross-build-start" ]
+
 # Update packages and install software
 RUN apt-get update \
     && apt-get -y upgrade \
@@ -14,3 +16,5 @@ ENV TRANSMISSION_DOWNLOAD_DIR=/data/completed \
     RSS_URL=**None**
 
 CMD ["/etc/transmission-rss/start.sh"]
+
+RUN [ "cross-build-end" ]
diff --git a/proxy/Dockerfile.armhf b/proxy/Dockerfile.armhf
index ac73d269a..48d4c70cd 100644
--- a/proxy/Dockerfile.armhf
+++ b/proxy/Dockerfile.armhf
@@ -1,5 +1,7 @@
 FROM resin/rpi-raspbian:stretch
 
+RUN [ "cross-build-start" ]
+
 RUN apt-get update \
       && apt-get install -y \
         ca-certificates \
@@ -15,3 +17,4 @@ COPY nginx.conf /etc/nginx/nginx.conf
 
 CMD ["nginx", "-g", "daemon off;"]
 
+RUN [ "cross-build-end" ]