diff --git a/build.armhf.sh b/build.armhf.sh
index 44fdce64..b927dfc8 100755
--- a/build.armhf.sh
+++ b/build.armhf.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-(cd gateway && ./armhf.build.sh)
-(cd watchdog && ./armhf.build.sh)
+(cd gateway && ./build.armhf.sh) && \
+  (cd watchdog && ./build.armhf.sh)
diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf
index 852804cb..13149845 100644
--- a/sample-functions/NodeInfo/Dockerfile.armhf
+++ b/sample-functions/NodeInfo/Dockerfile.armhf
@@ -1,8 +1,7 @@
 FROM armhf/alpine:latest
-RUN apk --update add nodejs
-
-COPY fwatchdog /usr/bin
+RUN apk --no-cache add nodejs
 
+COPY fwatchdog-armhf /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json .
diff --git a/sample-functions/NodeInfo/build.armhf.sh b/sample-functions/NodeInfo/build.armhf.sh
index eab925f0..d04fb667 100755
--- a/sample-functions/NodeInfo/build.armhf.sh
+++ b/sample-functions/NodeInfo/build.armhf.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -f Dockerfile.armhf -t alexellis2/faas-nodeinfo:latest-armhf .
+docker build -f Dockerfile.armhf -t functions/nodeinfo:latest-armhf .