diff --git a/sample-functions/README.md b/sample-functions/README.md
index 6a02441c..771812b4 100644
--- a/sample-functions/README.md
+++ b/sample-functions/README.md
@@ -11,9 +11,11 @@ For examples of hello-world in different programming languages see inside the Ba
 
 ## Sample functions from the FaaS stack
 
+* [FaaS-And_Furious Community functions](https://github.com/faas-and-furious) (new)
+
 > Also see the [community page](https://github.com/openfaas/faas/blob/master/community.md) for functions created by FaaS users and contributors.
 
-Here is a list of the sample functions included this repository.
+Here is a list of some of the sample functions included this repository.
 
 | Name                   | Details |
 |------------------------|-----------------------------------------                          |
@@ -21,7 +23,7 @@ Here is a list of the sample functions included this repository.
 | ApiKeyProtected        | Example in Golang showing how to read X-Api-Key header |
 | CaptainsIntent         | Alexa skill - find the count of Docker Captains |
 | ChangeColorIntent      | Alexa skill - change the colour of IoT-connected lights |
-| CatService             | Uses `cat` from BusyBox to provide an echo service |
+| echo                   | Uses `cat` from BusyBox to provide an echo function |
 | DockerHubStats         | Golang function gives the count of repos a user has on the Docker hub |
 | HostnameIntent         | Prints the hostname of a container |
 | NodeInfo               | Node.js - gives CPU/network info on the current container |
diff --git a/sample-functions/catservice/Dockerfile b/sample-functions/catservice/Dockerfile
deleted file mode 100644
index b880ccdc..00000000
--- a/sample-functions/catservice/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM alpine:latest
-ENTRYPOINT []
-
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
-
-ENV fprocess "/bin/cat"
-
-EXPOSE 8080
-CMD ["/usr/bin/fwatchdog"]
diff --git a/sample-functions/echo/Dockerfile b/sample-functions/echo/Dockerfile
new file mode 100644
index 00000000..fcccb301
--- /dev/null
+++ b/sample-functions/echo/Dockerfile
@@ -0,0 +1,2 @@
+FROM functions/alpine:latest
+ENV fprocess "/bin/cat"
diff --git a/sample-functions/samples.yml b/sample-functions/samples.yml
index da0d7edd..f87409f3 100644
--- a/sample-functions/samples.yml
+++ b/sample-functions/samples.yml
@@ -18,10 +18,10 @@ functions:
     handler: ./CaptainsIntent
     image: functions/captainsintent:latest
 
-  catservice:
+  echo:
     lang: Dockerfile
-    handler: ./catservice
-    image: functions/catservice:latest
+    handler: ./echo
+    image: functions/faas-echo:latest
 
   ChangeColorIntent:
     lang: Dockerfile