diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index ee56f2ad..9bdde9c2 100644
--- a/docker-compose.armhf.yml
+++ b/docker-compose.armhf.yml
@@ -51,7 +51,19 @@ services:
             placement:
                 constraints: [node.role == manager]
 
-# Sample functions go here.
+# sample functions go here, but can be created in the UI too.
+    nodeinfo:
+        image: functions/nodeinfo:latest-armhf
+        labels:
+            function: "true"
+        depends_on:
+            - gateway
+        networks:
+            - functions
+        environment:
+            no_proxy:   "gateway"
+            https_proxy: $https_proxy
+
     wordcount:
         image: functions/alpine:latest-armhf
         labels:
diff --git a/sample-functions/MarkdownRender/.gitignore b/sample-functions/MarkdownRender/.gitignore
new file mode 100644
index 00000000..b80f0bd6
--- /dev/null
+++ b/sample-functions/MarkdownRender/.gitignore
@@ -0,0 +1 @@
+app
diff --git a/sample-functions/MarkdownRender/Dockerfile.build.armhf b/sample-functions/MarkdownRender/Dockerfile.build.armhf
index 1e0ed376..4a2ed856 100644
--- a/sample-functions/MarkdownRender/Dockerfile.build.armhf
+++ b/sample-functions/MarkdownRender/Dockerfile.build.armhf
@@ -1,4 +1,4 @@
-FROM alexellis2/alexellis2/go-armhf:1.7.4
+FROM alexellis2/go-armhf:1.7.4
 
 RUN mkdir -p /go/src/app
 COPY handler.go /go/src/app
diff --git a/sample-functions/MarkdownRender/app b/sample-functions/MarkdownRender/app
deleted file mode 100755
index 6dcb3f56..00000000
Binary files a/sample-functions/MarkdownRender/app and /dev/null differ
diff --git a/sample-functions/MarkdownRender/build.armhf.sh b/sample-functions/MarkdownRender/build.armhf.sh
index 09709a93..22bd2e70 100755
--- a/sample-functions/MarkdownRender/build.armhf.sh
+++ b/sample-functions/MarkdownRender/build.armhf.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
-echo Building alexellis2/faas-markdownrender:build-armhf
+echo Building functions/markdownrender:build-armhf
 
 docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
-    -t alexellis2/faas-markdownrender:build-armhf \
+    -t functions/markdownrender:build-armhf \
     . -f Dockerfile.build.armhf
 
-docker create --name render_extract alexellis2/faas-markdownrender:build-armhf
+docker create --name render_extract functions/markdownrender:build-armhf
 docker cp render_extract:/go/src/app/app ./app
 docker rm -f render_extract
 
-echo Building alexellis2/faas-markdownrender:latest-armhf
-docker build --no-cache -t alexellis2/faas-markdownrender:latest-armhf .\
+echo Building functions/markdownrender:latest-armhf
+docker build --no-cache -t functions/markdownrender:latest-armhf .\
        -f Dockerfile.armhf
diff --git a/sample-functions/MarkdownRender/build.sh b/sample-functions/MarkdownRender/build.sh
index 12a2f285..c12775f7 100755
--- a/sample-functions/MarkdownRender/build.sh
+++ b/sample-functions/MarkdownRender/build.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
-echo Building alexellis2/faas-markdownrender:build
+echo Building functions/markdownrender:build
 
 docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
-    -t alexellis2/faas-markdownrender . -f Dockerfile.build
+    -t functions/markdownrender . -f Dockerfile.build
 
-docker create --name render_extract alexellis2/faas-markdownrender
+docker create --name render_extract functions/markdownrender
 docker cp render_extract:/go/src/app/app ./app
 docker rm -f render_extract
 
-echo Building alexellis2/faas-markdownrender:latest
-docker build --no-cache -t alexellis2/faas-markdownrender:latest .
+echo Building functions/markdownrender:latest
+docker build --no-cache -t functions/markdownrender:latest .
diff --git a/sample-functions/NodeInfo/build.sh b/sample-functions/NodeInfo/build.sh
index 5f0a4578..a8220299 100755
--- a/sample-functions/NodeInfo/build.sh
+++ b/sample-functions/NodeInfo/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t alexellis2/faas-nodeinfo .
+docker build -t functions/nodeinfo .