diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile
index c7fd5561..bd17013f 100644
--- a/sample-functions/CHelloWorld/src/Dockerfile
+++ b/sample-functions/CHelloWorld/src/Dockerfile
@@ -22,5 +22,7 @@ COPY --from=builder /tmp /tmp
 
 ENV fprocess="/main"
 
+HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
+
 CMD ["/fwatchdog"]
 
diff --git a/sample-functions/WordCountFunction/Dockerfile b/sample-functions/WordCountFunction/Dockerfile
index 34f5055f..4195b50e 100644
--- a/sample-functions/WordCountFunction/Dockerfile
+++ b/sample-functions/WordCountFunction/Dockerfile
@@ -1,4 +1,4 @@
-FROM alexellis2/faas-alpinefunction:latest
+FROM functions/alpine:latest
 
 # Populate example here
 ENV fprocess="wc"
diff --git a/sample-functions/stack.yml b/sample-functions/stack.yml
index 2eb6b5bc..ca7ff9b1 100644
--- a/sample-functions/stack.yml
+++ b/sample-functions/stack.yml
@@ -7,6 +7,8 @@ functions:
     lang: dockerfile
     handler: ./AlpineFunction
     image: functions/alpine:latest
+    environment:
+      fprocess: "cat"
 
   apikeyprotected:
     lang: dockerfile
@@ -85,6 +87,8 @@ functions:
     lang: dockerfile
     handler: ./WordCountFunction
     image: functions/wordcount:latest
+    environment:
+      fprocess: "wc"
 
   nmap:
     lang: dockerfile