diff --git a/README.md b/README.md
index aa8c018..8b7f00e 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
 
 Build env for hassio
 
-[HassIO](https://github.com/pvizeli/hassio)
-[HassIO-Addons](https://github.com/pvizeli/hassio-addons)
+[HassIO](https://github.com/homeassistant/hassio)
+[HassIO-Addons](https://github.com/homeassistant/hassio-addons)
 
 # Build Server
 
 You need a linux with [AUFS](https://docs.docker.com/engine/userguide/storagedriver/aufs-driver/) and docker support. You need to have the build user in docker group for he can run docker. It is not possible to run this process as root! You need also install `jq`
 
-Builds are published on: https://hub.docker.com/r/pvizeli/
+Builds are published on: https://hub.docker.com/r/homeassistant/
 
 ## Build env
 
diff --git a/build-scripts/addons/create_hassio_addon.sh b/build-scripts/addons/create_hassio_addon.sh
index be57a0a..5e840ec 100755
--- a/build-scripts/addons/create_hassio_addon.sh
+++ b/build-scripts/addons/create_hassio_addon.sh
@@ -3,7 +3,7 @@
 set -e
 
 BUILD_CONTAINER_NAME=hassio-addons-$$
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 cleanup() {
     echo "[INFO] Cleanup."
@@ -71,7 +71,7 @@ docker run --rm \
     -e DOCKER_TAG=$VERSION \
     --name $BUILD_CONTAINER_NAME \
     --privileged \
-    pvizeli/docker-build-env \
+    homeassistant/docker-build-env \
     /run-docker.sh
 
 echo "[INFO] cleanup WORKSPACE"
diff --git a/build-scripts/docker-build-env/create_build_env.sh b/build-scripts/docker-build-env/create_build_env.sh
index fe1fb13..2d4f5ab 100755
--- a/build-scripts/docker-build-env/create_build_env.sh
+++ b/build-scripts/docker-build-env/create_build_env.sh
@@ -2,7 +2,7 @@
 
 set -ev
 
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 DOCKER_IMAGE=docker-build-env
 
 # Get the absolute script location
diff --git a/build-scripts/hassio-supervisor/create_hassio_supervisor.sh b/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
index ba20ba0..09eb22b 100755
--- a/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
+++ b/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
@@ -3,7 +3,7 @@
 set -e
 
 BUILD_CONTAINER_NAME=hassio-build-$$
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 cleanup() {
     echo "[INFO] Cleanup."
@@ -67,7 +67,7 @@ docker run --rm \
     -e DOCKER_TAG=$DOCKER_TAG \
     --name $BUILD_CONTAINER_NAME \
     --privileged \
-    pvizeli/docker-build-env \
+    homeassistant/docker-build-env \
     /run-docker.sh
 
 echo "[INFO] cleanup WORKSPACE"
diff --git a/build-scripts/homeassistant/create_homeassistant.sh b/build-scripts/homeassistant/create_homeassistant.sh
index 1188cea..d0a64f2 100755
--- a/build-scripts/homeassistant/create_homeassistant.sh
+++ b/build-scripts/homeassistant/create_homeassistant.sh
@@ -3,7 +3,7 @@
 set -e
 
 BUILD_CONTAINER_NAME=homeassistant-build-$$
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 cleanup() {
     echo "[INFO] Cleanup."
@@ -82,7 +82,7 @@ docker run --rm \
     -e DOCKER_TAG=$DOCKER_TAG \
     --name $BUILD_CONTAINER_NAME \
     --privileged \
-    pvizeli/docker-build-env \
+    homeassistant/docker-build-env \
     /run-docker.sh
 
 echo "[INFO] cleanup WORKSPACE"
diff --git a/build-scripts/resinhup-build/create_resinhup.sh b/build-scripts/resinhup-build/create_resinhup.sh
index 7ff7f31..cbb15e7 100755
--- a/build-scripts/resinhup-build/create_resinhup.sh
+++ b/build-scripts/resinhup-build/create_resinhup.sh
@@ -3,7 +3,7 @@
 set -e
 
 BUILD_CONTAINER_NAME=resinhup-build-$$
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 cleanup() {
     echo "[INFO] Cleanup."
@@ -75,7 +75,7 @@ docker run --rm \
     -e DOCKER_TAG=$DOCKER_TAG \
     --name $BUILD_CONTAINER_NAME \
     --privileged \
-    pvizeli/docker-build-env \
+    homeassistant/docker-build-env \
     /run-docker.sh
 
 echo "[INFO] cleanup WORKSPACE"
diff --git a/build-scripts/resinos-build/create_resinos.sh b/build-scripts/resinos-build/create_resinos.sh
index 30ba679..46542a4 100755
--- a/build-scripts/resinos-build/create_resinos.sh
+++ b/build-scripts/resinos-build/create_resinos.sh
@@ -3,7 +3,7 @@
 set -e
 
 BUILD_CONTAINER_NAME=yocto-build-$$
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 cleanup() {
     echo "[INFO] Cleanup."
@@ -91,7 +91,7 @@ docker run --rm \
     -e BUILDER_GID=$(id -g) \
     --name $BUILD_CONTAINER_NAME \
     --privileged \
-    pvizeli/yocto-build-env \
+    homeassistant/yocto-build-env \
     /run-resinos.sh \
         --log \
         --machine "$MACHINE" \
diff --git a/build-scripts/yocto-build-env/create_build_env.sh b/build-scripts/yocto-build-env/create_build_env.sh
index c4b8469..64e4a64 100755
--- a/build-scripts/yocto-build-env/create_build_env.sh
+++ b/build-scripts/yocto-build-env/create_build_env.sh
@@ -2,7 +2,7 @@
 
 set -ev
 
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 DOCKER_IMAGE=yocto-build-env
 
 # Get the absolute script location
diff --git a/install/hassio_install b/install/hassio_install
index 964a0d8..20ba76a 100644
--- a/install/hassio_install
+++ b/install/hassio_install
@@ -2,7 +2,7 @@
 set -e
 
 ARCH=$(uname -m)
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 URL_VERSION="https://raw.githubusercontent.com/home-assistant/hassio/master/version.json"
 URL_START_HASSIO="https://raw.githubusercontent.com/home-assistant/hassio-build/master/install/misc/hassio-start"
 URL_GENERIC_HC="https://raw.githubusercontent.com/home-assistant/hassio-build/master/generic-hc"
diff --git a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
index b64892f..8735b26 100644
--- a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
+++ b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
@@ -1,13 +1,13 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SUPERVISOR_REPOSITORY_armv5 = "pvizeli/armhf-hassio-supervisor"
-SUPERVISOR_REPOSITORY_armv6 = "pvizeli/armhf-hassio-supervisor"
-SUPERVISOR_REPOSITORY_armv7a = "pvizeli/armhf-hassio-supervisor"
-SUPERVISOR_REPOSITORY_armv7ve = "pvizeli/armhf-hassio-supervisor"
-SUPERVISOR_REPOSITORY_aarch64 = "pvizeli/aarch64-hassio-supervisor"
-SUPERVISOR_REPOSITORY_x86 = "pvizeli/i386-hassio-supervisor"
-SUPERVISOR_REPOSITORY_x86-64 = "pvizeli/amd64-hassio-supervisor"
+SUPERVISOR_REPOSITORY_armv5 = "homeassistant/armhf-hassio-supervisor"
+SUPERVISOR_REPOSITORY_armv6 = "homeassistant/armhf-hassio-supervisor"
+SUPERVISOR_REPOSITORY_armv7a = "homeassistant/armhf-hassio-supervisor"
+SUPERVISOR_REPOSITORY_armv7ve = "homeassistant/armhf-hassio-supervisor"
+SUPERVISOR_REPOSITORY_aarch64 = "homeassistant/aarch64-hassio-supervisor"
+SUPERVISOR_REPOSITORY_x86 = "homeassistant/i386-hassio-supervisor"
+SUPERVISOR_REPOSITORY_x86-64 = "homeassistant/amd64-hassio-supervisor"
 
 SUPERVISOR_TAG = "${HASSIO_SUPERVISOR_TAG}"
 TARGET_REPOSITORY = "${SUPERVISOR_REPOSITORY}"
diff --git a/meta-hassio/recipes-support/resinhup/resinhup/resinhup b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
index 80ad2a2..382cf34 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup/resinhup
+++ b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
@@ -7,7 +7,7 @@ LOGFILE=/tmp/`basename "$0"`.log
 LOG=yes
 ONLY_SUPERVISOR=no
 NOREBOOT=no
-DOCKER_REPO=pvizeli
+DOCKER_REPO=homeassistant
 
 # Don't run anything before this source as it sets PATH here
 source /etc/profile