diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e44a435..044b547 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   ADDON_SLUG: home-panel
   ADDON_TARGET: home-panel
   DOCKER_DRIVER: overlay2
-  DOCKER_HUB_ORG: hassioaddons
+  DOCKER_HUB_ORG: timmo001
 
 stages:
   - preflight
diff --git a/README.md b/README.md
index 272cdf7..56f97b6 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 [commits-shield]: https://img.shields.io/github/commit-activity/y/timmo001/addon-home-panel.svg
 [commits]: https://github.com/timmo001/addon-home-panel/commits/master
 [contributors]: https://github.com/timmo001/addon-home-panel/graphs/contributors
-[dockerhub]: https://hub.docker.com/r/hassioaddons/home-panel
+[dockerhub]: https://hub.docker.com/r/timmo001/home-panel
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [timmo]: https://github.com/timmo001
 [gitlabci-shield]: https://gitlab.com/timmo001/addon-home-panel/badges/master/pipeline.svg
@@ -206,18 +206,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 [i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [issue]: https://github.com/timmo001/addon-home-panel/issues
 [keepchangelog]: http://keepachangelog.com/en/1.0.0/
-[layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/home-panel.svg
+[layers-shield]: https://images.microbadger.com/badges/image/timmo001/home-panel.svg
 [license-shield]: https://img.shields.io/github/license/timmo001/addon-home-panel.svg
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
-[microbadger]: https://microbadger.com/images/hassioaddons/home-panel
+[microbadger]: https://microbadger.com/images/timmo001/home-panel
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/home-panel.svg
+[pulls-shield]: https://img.shields.io/docker/pulls/timmo001/home-panel.svg
 [reddit]: https://reddit.com/r/homeassistant
 [releases-shield]: https://img.shields.io/github/release/timmo001/addon-home-panel.svg
 [releases]: https://github.com/timmo001/addon-home-panel/releases
 [repository]: https://github.com/timmo001/repository
 [semver]: http://semver.org/spec/v2.0.0.html
-[version-shield]: https://images.microbadger.com/badges/version/hassioaddons/home-panel.svg
+[version-shield]: https://images.microbadger.com/badges/version/timmo001/home-panel.svg
 [home-panel]: https://github.com/timmo001/home-panel
 [light-theme]: https://raw.githubusercontent.com/timmo001/home-panel/master/docs/resources/light-theme.png
 [dark-theme]: https://raw.githubusercontent.com/timmo001/home-panel/master/docs/resources/dark-theme.png