diff --git a/docker-compose.yml b/docker-compose.yml
index 4a9ee8392231144909db3fe735a8eb31acb573e4..969c0ea30e6266f2d6e5bc2e50af5b3cf35663f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,7 +65,7 @@ services:
 
     # Pass a username as an argument to find how many images user has pushed to Docker Hub.
     hubstats:
-        image: alexellis2/faas-dockerhubstats:latest
+        image: functions/hubstats:latest 
         labels:
             function: "true"
         depends_on:
diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile
index 3f15395594ccb81a39d1e1deff3ce2e6d106f191..4cde949392fcb3ee2fe96d2963daea18a3a9e049 100644
--- a/sample-functions/DockerHubStats/Dockerfile
+++ b/sample-functions/DockerHubStats/Dockerfile
@@ -8,7 +8,7 @@ COPY . /go/src/github.com/alexellis/faas/sample-functions/DockerHubStats
 
 RUN make
 
-ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/0.6.0/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/go/bin/DockerHubStats"