diff --git a/atom.xml b/atom.xml
index e06167d471..5e42c182dd 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -1157,7 +1157,7 @@ output = audioresample ! audio/x-raw,rate=48000,channels=2,format=S16LE ! audioc
         - <span class="string"><span class="content">mqtt</span></span>
 
 <span class="key">homeassistant</span>:
-    <span class="key">image</span>: <span class="string"><span class="content">balloob/home-assistant</span></span>
+    <span class="key">image</span>: <span class="string"><span class="content">homeassistant/home-assistant:latest</span></span>
     <span class="key">ports</span>:
         - <span class="string"><span class="content">80:80</span></span>
     <span class="key">volumes</span>:
diff --git a/blog/2016/02/09/smarter-smart-things-with-mqtt-and-home-assistant/index.html b/blog/2016/02/09/smarter-smart-things-with-mqtt-and-home-assistant/index.html
index e2959b57b3..00f0a9b514 100644
--- a/blog/2016/02/09/smarter-smart-things-with-mqtt-and-home-assistant/index.html
+++ b/blog/2016/02/09/smarter-smart-things-with-mqtt-and-home-assistant/index.html
@@ -288,7 +288,7 @@
         - <span class="string"><span class="content">mqtt</span></span>
 
 <span class="key">homeassistant</span>:
-    <span class="key">image</span>: <span class="string"><span class="content">balloob/home-assistant</span></span>
+    <span class="key">image</span>: <span class="string"><span class="content">homeassistant/home-assistant:latest</span></span>
     <span class="key">ports</span>:
         - <span class="string"><span class="content">80:80</span></span>
     <span class="key">volumes</span>:
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 15d951119e..c6230d90d0 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index c4ba689737..ac366b14ea 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index fb34718a91..8bb9c7c1f4 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -376,7 +376,7 @@ output = audioresample ! audio/x-raw,rate=48000,channels=2,format=S16LE ! audioc
         - <span class="string"><span class="content">mqtt</span></span>
 
 <span class="key">homeassistant</span>:
-    <span class="key">image</span>: <span class="string"><span class="content">balloob/home-assistant</span></span>
+    <span class="key">image</span>: <span class="string"><span class="content">homeassistant/home-assistant:latest</span></span>
     <span class="key">ports</span>:
         - <span class="string"><span class="content">80:80</span></span>
     <span class="key">volumes</span>:
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 4b92c9e564..11bd0517b0 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 8895772852..d52d96a936 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index ea34699a06..59b8641a20 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -196,7 +196,7 @@
         - <span class="string"><span class="content">mqtt</span></span>
 
 <span class="key">homeassistant</span>:
-    <span class="key">image</span>: <span class="string"><span class="content">balloob/home-assistant</span></span>
+    <span class="key">image</span>: <span class="string"><span class="content">homeassistant/home-assistant:latest</span></span>
     <span class="key">ports</span>:
         - <span class="string"><span class="content">80:80</span></span>
     <span class="key">volumes</span>:
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index fa6ece5625..ae486dd990 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index d9cb26d8ac..9b95d148de 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 845fa82c01..c4137c4c7d 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 1296ea4112..8b2dc95f62 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 64feffcb6f..360b0efb68 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index e56c9b3b15..66577b306e 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 0ea54ab281..e74acbe609 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index bf2d9b6496..d31253e92b 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 953494bc56..9ee93d9f44 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-05-06T16:56:53+00:00</updated>
+  <updated>2016-05-07T06:01:08+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/sitemap.xml b/sitemap.xml
index 5ace4a44bc..a54f6d75f8 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1535,18 +1535,18 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-05-06T16:56:17+00:00</lastmod>
+    <lastmod>2016-05-07T06:00:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-05-06T16:56:17+00:00</lastmod>
+    <lastmod>2016-05-07T06:00:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-05-06T16:56:17+00:00</lastmod>
+    <lastmod>2016-05-07T06:00:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-05-06T16:56:17+00:00</lastmod>
+    <lastmod>2016-05-07T06:00:33+00:00</lastmod>
   </url>
 </urlset>