diff --git a/pi4j-builder-1.4/Dockerfile b/pi4j-builder-1.4/Dockerfile
index c59dda0..7e44d18 100644
--- a/pi4j-builder-1.4/Dockerfile
+++ b/pi4j-builder-1.4/Dockerfile
@@ -19,7 +19,7 @@ LABEL org.label-schema.version=$BUILDVERSION
 LABEL org.label-schema.docker.cmd="docker run --user \"$(id -u):$(id -g)\" --rm --volume $(pwd):/build pi4j/pi4j-builder:$BUILDVERSION"
 
 RUN echo "========================================================="
-RUN echo "  BUILDING DOCKER Pi4J v1.4 BUILDER IMAGE FOR: $TARGETARCH"
+RUN echo "  BUILDING DOCKER Pi4J v$BUILDVERSION BUILDER IMAGE FOR: $TARGETARCH"
 RUN echo "========================================================="
 
 # ---------------------------------------------------------------------------------
diff --git a/pi4j-builder-2.0/Dockerfile b/pi4j-builder-2.0/Dockerfile
index 038f070..1ac387c 100644
--- a/pi4j-builder-2.0/Dockerfile
+++ b/pi4j-builder-2.0/Dockerfile
@@ -19,7 +19,7 @@ LABEL org.label-schema.version=$BUILDVERSION
 LABEL org.label-schema.docker.cmd="docker run --user \"$(id -u):$(id -g)\" --rm --volume $(pwd):/build pi4j/pi4j-builder:$BUILDVERSION"
 
 RUN echo "========================================================="
-RUN echo "  BUILDING DOCKER Pi4J v2.0 BUILDER IMAGE FOR: $TARGETARCH"
+RUN echo "  BUILDING DOCKER Pi4J v$BUILDVERSION BUILDER IMAGE FOR: $TARGETARCH"
 RUN echo "========================================================="
 
 # ---------------------------------------------------------------------------------
diff --git a/pi4j-builder-native/Dockerfile b/pi4j-builder-native/Dockerfile
index 1a53ca2..4251296 100644
--- a/pi4j-builder-native/Dockerfile
+++ b/pi4j-builder-native/Dockerfile
@@ -22,18 +22,25 @@ LABEL org.label-schema.docker.cmd="docker run --user \"$(id -u):$(id -g)\" --rm
 RUN apt-get update
 
 # install ARM cross compiler toolchains for 32-bit ARM
-RUN apt-get install --yes gcc-arm-linux-gnueabi
+#RUN apt-get install --yes gcc-arm-linux-gnueabi
 
 # install ARM cross compiler toolchains for 32-bit ARMHF
-RUN apt-get install --yes gcc-arm-linux-gnueabihf
+#RUN apt-get install --yes gcc-arm-linux-gnueabihf
 
-# install ARM cross compiler toolchains for 32-bit ARM64
+# install ARM cross compiler toolchains for 64-bit ARM64
 # (only install on amd64 platforms)
 RUN if [ "$TARGETARCH" = "amd64" ] ; then apt-get --yes install gcc-aarch64-linux-gnu ; fi
 
+# install RaspberryPi ARM cross compiler toolchains for 32-bit ARMHF (ARMv6+ARMv7+ARMv8)
+# (get the latest RPI cross compiler tools from the GitHub repo)
+RUN git clone --progress --verbose https://github.com/raspberrypi/tools.git --depth=1 /opt/rpi-tools
+
 # clean APT cache
 RUN apt-get clean
 
+# configure the PATH for ARM cross compiler toolchains for 32-bit ARMHF (ARMv6 + ARMv7)
+ENV PATH="/opt/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin:${PATH}"
+
 # configure build time environment variables
 ENV PI4J_BUILDER_NATIVE="$BUILDVERSION"
 ENV PI4J_BUILDER_DATE="$BUILDDATE"